Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1806038imm; Mon, 3 Sep 2018 09:55:45 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaOlz0WnvquOR8eJXtfNi4aEt66GAkrtn+nn8wEZ9BfSK/c8Z9hwHy+8z5C+jtK6h0U1IId X-Received: by 2002:a63:170b:: with SMTP id x11-v6mr11138787pgl.364.1535993745649; Mon, 03 Sep 2018 09:55:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535993745; cv=none; d=google.com; s=arc-20160816; b=KCeUpFROs9GJ/9PnSivyrZT3lKis1v1Jn8E9NBqXBVR1JAFT8haml8MEHa3MkbAwEI 80Aa1Q2wykvaYmzWj7ECzvOq08eQrNOTGB0wU5qp9e+UKxfd+DzZSZUGHXwG7g2efNL3 HAwEgOM+rkljA1h/MiSGhUR5b7TJnjCYGsQ0qTg69JQOyd1mpvFBF1KrRsoApeHI+dhB 6IbvKWCqFtYu1saJ3AdF/BsDNTH/MQzb/375Rb39kvM4nREL2tf6AgPCTPaKTOwsxKfA 65lNA6PCzWedwnxOzkT38bsH+TCGAftRZzRRQVjUwc0GAjFMzFCv04jrxEgicgi6irlc 4/kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=JJWa5WoG5EUjqjne9lglhUDgrCY87QpYBww42SEC5yE=; b=sBlhR07UBA5QieYB1pTqXLx1ubeR5PgW0NHeVAFp9SdlflbUqHsJCQ3Ula3QKzwxNa Sqmxe4TJ3v0oDSrJn1PKd0vM6YEs6Rw1+WRioSJnkAcdGSe/PHRJs20Mrl28BDRuO6xI kA3ybfhNGdajtMfJYwMyRPzrOsTyufHcRSQHh2XbfKVN7uMdrA6JMOcSZX91nyGhlkMQ KYZ2xUoy4HHVhZfHVoNwHBpNy+45KXKMkX3rgYWsPWwF2koWgeODltmYiDYPhthKw/Ch n4wC2Zg0nGMyahB04Jm3ik3eSjV8ww2Z8HovKHNqtUqKbrdAjpPmW50bg/I7G19jntj3 k11g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p84-v6si19201210pfj.101.2018.09.03.09.55.30; Mon, 03 Sep 2018 09:55:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728843AbeICVOg (ORCPT + 99 others); Mon, 3 Sep 2018 17:14:36 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:38170 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728281AbeICVOf (ORCPT ); Mon, 3 Sep 2018 17:14:35 -0400 Received: from localhost (ip-213-127-74-90.ip.prioritytelecom.net [213.127.74.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id DD0C0CF8; Mon, 3 Sep 2018 16:53:37 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 18/80] net: caif: Add a missing rcu_read_unlock() in caif_flow_cb Date: Mon, 3 Sep 2018 18:48:56 +0200 Message-Id: <20180903164934.887840331@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180903164934.171677301@linuxfoundation.org> References: <20180903164934.171677301@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: YueHaibing [ Upstream commit 64119e05f7b31e83e2555f6782e6cdc8f81c63f4 ] Add a missing rcu_read_unlock in the error path Fixes: c95567c80352 ("caif: added check for potential null return") Signed-off-by: YueHaibing Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/caif/caif_dev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c @@ -131,8 +131,10 @@ static void caif_flow_cb(struct sk_buff caifd = caif_get(skb->dev); WARN_ON(caifd == NULL); - if (caifd == NULL) + if (!caifd) { + rcu_read_unlock(); return; + } caifd_hold(caifd); rcu_read_unlock();