Path: csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod From: "Levin, Alexander (Sasha Levin)" Newsgroups: linux.kernel Subject: [PATCH review for 4.9 12/50] netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value. Date: Mon, 25 Sep 2017 03:40:03 +0200 Message-ID: References: X-Original-To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506302054; x=1537838054; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=3ruzYqs5wmiiGvRwH5TOHrV7sjn/2AYEbo7tGGAOEIA=; b=qgBmRb0ylQfBXykuS19cYIeYINasNQW5e3bnZ4loZT0QoVABS0ir8iUA Pzr8VYJfIGqC9C4LvTfzhT+M3nlSu7owlzuIlFBeb/RUzAmgIxzHyO687 RHB9tsaKsqX/+83Z0i8lWvWnYhpDIZ40TAgWvNoJ9eyTjPFUH5UW4mcjk U=; Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506301969; x=1537837969; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=3ruzYqs5wmiiGvRwH5TOHrV7sjn/2AYEbo7tGGAOEIA=; b=fxtC5bufFLCr1KuDrWXt3G8zgOqGPF4dLFe2W7rVf4EJorkMhwuli0F5 HvaTBZi+cy6T3sO6XE3hWo/+Um4Nj0jG4DxiIbEBSRSy+EtvTsPgMdR0w lCwpFOyvRiMJrnyGTFQAS7JAHBlpUdjeKqp9hh/A9FCNGIosLEeXaerO7 Q=; Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506301969; x=1537837969; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=3ruzYqs5wmiiGvRwH5TOHrV7sjn/2AYEbo7tGGAOEIA=; b=fxtC5bufFLCr1KuDrWXt3G8zgOqGPF4dLFe2W7rVf4EJorkMhwuli0F5 HvaTBZi+cy6T3sO6XE3hWo/+Um4Nj0jG4DxiIbEBSRSy+EtvTsPgMdR0w lCwpFOyvRiMJrnyGTFQAS7JAHBlpUdjeKqp9hh/A9FCNGIosLEeXaerO7 Q=; X-Host: discovery.odc.vzwcorp.com Thread-Topic: [PATCH review for 4.9 12/50] netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value. Thread-Index: AQHTNZtk6Ups2SytqEGtr+w+b4/U8g== Accept-Language: en-US Content-Language: en-US X-Ms-Exchange-Messagesentrepresentingtype: 1 X-Ms-Exchange-Transport-Fromentityheader: Hosted X-Originating-IP: [10.144.60.250] Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 46 Organization: linux.* mail to news gateway X-Original-Cc: Jarno Rajahalme , Pablo Neira Ayuso , "Levin, Alexander (Sasha Levin)" X-Original-Date: Mon, 25 Sep 2017 01:12:43 +0000 X-Original-Message-ID: <20170925011225.10029-12-alexander.levin@verizon.com> X-Original-References: <20170925011225.10029-1-alexander.levin@verizon.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1738705 From: Jarno Rajahalme [ Upstream commit 4b86c459c7bee3acaf92f0e2b4c6ac803eaa1a58 ] Commit 4dee62b1b9b4 ("netfilter: nf_ct_expect: nf_ct_expect_insert() returns void") inadvertently changed the successful return value of nf_ct_expect_related_report() from 0 to 1 due to __nf_ct_expect_check() returning 1 on success. Prevent this regression in the future by changing the return value of __nf_ct_expect_check() to 0 on success. Signed-off-by: Jarno Rajahalme Acked-by: Joe Stringer Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_expect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntra= ck_expect.c index f8dbacf66795..0d6c72d6b9ba 100644 --- a/net/netfilter/nf_conntrack_expect.c +++ b/net/netfilter/nf_conntrack_expect.c @@ -411,7 +411,7 @@ static inline int __nf_ct_expect_check(struct nf_conntr= ack_expect *expect) struct net *net =3D nf_ct_exp_net(expect); struct hlist_node *next; unsigned int h; - int ret =3D 1; + int ret =3D 0; =20 if (!master_help) { ret =3D -ESHUTDOWN; @@ -461,7 +461,7 @@ int nf_ct_expect_related_report(struct nf_conntrack_exp= ect *expect, =20 spin_lock_bh(&nf_conntrack_expect_lock); ret =3D __nf_ct_expect_check(expect); - if (ret <=3D 0) + if (ret < 0) goto out; =20 ret =3D nf_ct_expect_insert(expect); --=20 2.11.0