Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp7279421imu; Wed, 14 Nov 2018 14:46:09 -0800 (PST) X-Google-Smtp-Source: AJdET5dyD/XEiaDjC1V8C/RtrnlMUo+amlBiplVjzHcxY8t1hYiicgIZFeNGpLeCIlK14yJapPbA X-Received: by 2002:a62:1095:: with SMTP id 21-v6mr3763528pfq.227.1542235569252; Wed, 14 Nov 2018 14:46:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542235569; cv=none; d=google.com; s=arc-20160816; b=xuQvogar5aHSJiU3h0dW0oNmSREKjqlKYbBgBrrh2Lx739mvsIDTsTTXfA1UgRs+M7 C/RVvL2bCLAHMqbTYRMbIJDulQK1hm346VMhYzoG3OAWxMXZpxP171U38SGXfWCEohPw UrGWrPYmDCVtV/RVqayJ18kp+vkgKw6p4u6OtABzaSMiAlu60wtpFV7mCOG4d8IgJW1B 392/hrkNJ55SYxnh0tAnckEzlAdK1lXbHia7JHOvaDnp3G7PVZVhLvmQ0sdqfsz/gXZG 4EoSs7Kg7iZItHxaf+rUUuKDdGix1CYy+vDpw3CXuLkvYyqlJ5gCAdh4mKSWXujxa/Qb /0dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=FLEDqyQqXE4CCTUev8qV97ppYLCPOhdmtwI/T898Qu0=; b=TgUg0i++i69mon4+CZ4hkUCiVJtxPDfBMSjMRZZa+INylGfYJunCwpJsoCEhdVbo8v T7vvSJLEkhsNIqCMJA3aQ7eZAhUJuj13bD23LIO2xsy+pv3HARjAeFTKBujw3WM+mTH2 y7rkz1+XuvZau4Ay1ds5bWiIJcSgRi/QF7RU0yCgVJHER+fdcVf/ZSC6lCFxi64gWc0c sFg99e5x5vgbrftE3f7ycV5flqs/SRzlNPgai1DRr9mHRZtcSxB+gSQXX6Cg/6nyI60q dlPETknad5+GeKP9ZW9Ux8ELk81ZcWzBaadEY1uSTQZl+pRwOks9GatWKg3MsDUb58xB TaCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xEfOLSf2; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 32-v6si27339088plc.370.2018.11.14.14.45.55; Wed, 14 Nov 2018 14:46:09 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=xEfOLSf2; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732953AbeKOIua (ORCPT + 99 others); Thu, 15 Nov 2018 03:50:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:34416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728366AbeKOI1Q (ORCPT ); Thu, 15 Nov 2018 03:27:16 -0500 Received: from sasha-vm.mshome.net (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1BC032251F; Wed, 14 Nov 2018 22:22:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234133; bh=+o49EspfuXdTJ+FcF11g8aK9UzURLz+7wHniHPfaM/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xEfOLSf2C9NJUr1F5kLobqy06pZFrl+jnm4vxHvU2gZj3xpUYkKChr5H1OKpnCP/i 2Bi4NG2sM25K7Rs+hooD8SHqUp3vti+hOxxKcyMwOd4BSkozyy3ZOXkhj+CQEiVcVc XuYaFDgYmjiELHws0oEeJzvkBfM1ZERizCC+uh5A= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jozsef Kadlecsik , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH AUTOSEL 4.19 20/73] netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment() Date: Wed, 14 Nov 2018 17:21:14 -0500 Message-Id: <20181114222207.98701-20-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222207.98701-1-sashal@kernel.org> References: <20181114222207.98701-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jozsef Kadlecsik [ Upstream commit 17b8b74c0f8dbf9b9e3301f9ca5b65dd1c079951 ] The function is called when rcu_read_lock() is held and not when rcu_read_lock_bh() is held. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- include/linux/netfilter/ipset/ip_set_comment.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/netfilter/ipset/ip_set_comment.h b/include/linux/netfilter/ipset/ip_set_comment.h index 8e2bab1e8e90..70877f8de7e9 100644 --- a/include/linux/netfilter/ipset/ip_set_comment.h +++ b/include/linux/netfilter/ipset/ip_set_comment.h @@ -43,11 +43,11 @@ ip_set_init_comment(struct ip_set *set, struct ip_set_comment *comment, rcu_assign_pointer(comment->c, c); } -/* Used only when dumping a set, protected by rcu_read_lock_bh() */ +/* Used only when dumping a set, protected by rcu_read_lock() */ static inline int ip_set_put_comment(struct sk_buff *skb, const struct ip_set_comment *comment) { - struct ip_set_comment_rcu *c = rcu_dereference_bh(comment->c); + struct ip_set_comment_rcu *c = rcu_dereference(comment->c); if (!c) return 0; -- 2.17.1