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;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Cong Wang <xiyou.wangcong@gmail.com>,
        Pablo Neira Ayuso <pablo@netfilter.org>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.18 51/65] netfilter: xt_hashlimit: use s->file
 instead of s->private
Thread-Topic: [PATCH AUTOSEL 4.18 51/65] netfilter: xt_hashlimit: use s->file
 instead of s->private
Thread-Index: AQHUWR8VxRaydUm8P0uGRK+jGdQt7w==
Date:   Mon, 1 Oct 2018 00:38:33 +0000
Message-ID: <20181001003754.146961-51-alexander.levin@microsoft.com>
References: <20181001003754.146961-1-alexander.levin@microsoft.com>
In-Reply-To: <20181001003754.146961-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: fbd5052e-0f3e-42d5-5ccb-08d627364909
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Oct 2018 00:38:33.8482
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0824
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Cong Wang <xiyou.wangcong@gmail.com>

[ Upstream commit 1286df269f498165061e0cf8092ca212545dbb5a ]

After switching to the new procfs API, it is supposed to
retrieve the private pointer from PDE_DATA(file_inode(s->file)),
s->private is no longer referred.

Fixes: 1cd671827290 ("netfilter/x_tables: switch to proc_create_seq_private=
")
Reported-by: Sami Farin <hvtaifwkbgefbaei@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Tested-by: Sami Farin <hvtaifwkbgefbaei@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 net/netfilter/xt_hashlimit.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 9b16402f29af..3e7d259e5d8d 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -1057,7 +1057,7 @@ static struct xt_match hashlimit_mt_reg[] __read_most=
ly =3D {
 static void *dl_seq_start(struct seq_file *s, loff_t *pos)
 	__acquires(htable->lock)
 {
-	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->private));
+	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->file));
 	unsigned int *bucket;
=20
 	spin_lock_bh(&htable->lock);
@@ -1074,7 +1074,7 @@ static void *dl_seq_start(struct seq_file *s, loff_t =
*pos)
=20
 static void *dl_seq_next(struct seq_file *s, void *v, loff_t *pos)
 {
-	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->private));
+	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->file));
 	unsigned int *bucket =3D v;
=20
 	*pos =3D ++(*bucket);
@@ -1088,7 +1088,7 @@ static void *dl_seq_next(struct seq_file *s, void *v,=
 loff_t *pos)
 static void dl_seq_stop(struct seq_file *s, void *v)
 	__releases(htable->lock)
 {
-	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->private));
+	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->file));
 	unsigned int *bucket =3D v;
=20
 	if (!IS_ERR(bucket))
@@ -1130,7 +1130,7 @@ static void dl_seq_print(struct dsthash_ent *ent, u_i=
nt8_t family,
 static int dl_seq_real_show_v2(struct dsthash_ent *ent, u_int8_t family,
 			       struct seq_file *s)
 {
-	struct xt_hashlimit_htable *ht =3D PDE_DATA(file_inode(s->private));
+	struct xt_hashlimit_htable *ht =3D PDE_DATA(file_inode(s->file));
=20
 	spin_lock(&ent->lock);
 	/* recalculate to show accurate numbers */
@@ -1145,7 +1145,7 @@ static int dl_seq_real_show_v2(struct dsthash_ent *en=
t, u_int8_t family,
 static int dl_seq_real_show_v1(struct dsthash_ent *ent, u_int8_t family,
 			       struct seq_file *s)
 {
-	struct xt_hashlimit_htable *ht =3D PDE_DATA(file_inode(s->private));
+	struct xt_hashlimit_htable *ht =3D PDE_DATA(file_inode(s->file));
=20
 	spin_lock(&ent->lock);
 	/* recalculate to show accurate numbers */
@@ -1160,7 +1160,7 @@ static int dl_seq_real_show_v1(struct dsthash_ent *en=
t, u_int8_t family,
 static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
 			    struct seq_file *s)
 {
-	struct xt_hashlimit_htable *ht =3D PDE_DATA(file_inode(s->private));
+	struct xt_hashlimit_htable *ht =3D PDE_DATA(file_inode(s->file));
=20
 	spin_lock(&ent->lock);
 	/* recalculate to show accurate numbers */
@@ -1174,7 +1174,7 @@ static int dl_seq_real_show(struct dsthash_ent *ent, =
u_int8_t family,
=20
 static int dl_seq_show_v2(struct seq_file *s, void *v)
 {
-	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->private));
+	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->file));
 	unsigned int *bucket =3D (unsigned int *)v;
 	struct dsthash_ent *ent;
=20
@@ -1188,7 +1188,7 @@ static int dl_seq_show_v2(struct seq_file *s, void *v=
)
=20
 static int dl_seq_show_v1(struct seq_file *s, void *v)
 {
-	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->private));
+	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->file));
 	unsigned int *bucket =3D v;
 	struct dsthash_ent *ent;
=20
@@ -1202,7 +1202,7 @@ static int dl_seq_show_v1(struct seq_file *s, void *v=
)
=20
 static int dl_seq_show(struct seq_file *s, void *v)
 {
-	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->private));
+	struct xt_hashlimit_htable *htable =3D PDE_DATA(file_inode(s->file));
 	unsigned int *bucket =3D v;
 	struct dsthash_ent *ent;
=20
--=20
2.17.1