[PATCH 3.12 137/235] drop_monitor: consider inserted data in genlmsg_end

Path	csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!news2.arglkargh.de!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Jiri Slaby <jslaby@suse.cz>
Newsgroups	linux.kernel
Subject	[PATCH 3.12 137/235] drop_monitor: consider inserted data in genlmsg_end
Date	Fri, 27 Jan 2017 12:20:02 +0100
Message-ID	<t4cJs-3oK-9@gated-at.bofh.it> (permalink)
References	<t4cq5-32y-3@gated-at.bofh.it>
X-Original-To	stable@vger.kernel.org
X-Amavis-Alert	BAD HEADER SECTION, Duplicate header field: "References"
X-Mailer	git-send-email 2.11.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	50
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, Reiter Wolfgang <wr0112358@gmail.com>, "David S . Miller" <davem@davemloft.net>, Jiri Slaby <jslaby@suse.cz>
X-Original-Date	Fri, 27 Jan 2017 11:54:30 +0100
X-Original-Message-ID	<abdddd2c24fe648ad0a999cef67b18c18eee26dc.1485514374.git.jslaby@suse.cz>
X-Original-References	<5b46dc789ca2be4046e4e40a131858d386cac741.1485514374.git.jslaby@suse.cz>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1568106

Show key headers only | View raw

From: Reiter Wolfgang <wr0112358@gmail.com>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

[ Upstream commit 3b48ab2248e61408910e792fe84d6ec466084c1a ]

Final nlmsg_len field update must reflect inserted net_dm_drop_point
data.

This patch depends on previous patch:
"drop_monitor: add missing call to genlmsg_end"

Signed-off-by: Reiter Wolfgang <wr0112358@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 net/core/drop_monitor.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 9c511cbb100d..5b40f7319504 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -107,7 +107,6 @@ static struct sk_buff *reset_per_cpu_data(struct per_cpu_dm_data *data)
 	}
 	msg = nla_data(nla);
 	memset(msg, 0, al);
-	genlmsg_end(skb, msg_header);
 	goto out;
 
 err:
@@ -117,6 +116,13 @@ out:
 	swap(data->skb, skb);
 	spin_unlock_irqrestore(&data->lock, flags);
 
+	if (skb) {
+		struct nlmsghdr *nlh = (struct nlmsghdr *)skb->data;
+		struct genlmsghdr *gnlh = (struct genlmsghdr *)nlmsg_data(nlh);
+
+		genlmsg_end(skb, genlmsg_data(gnlh));
+	}
+
 	return skb;
 }
 
-- 
2.11.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.12 137/235] drop_monitor: consider inserted data in genlmsg_end Jiri Slaby <jslaby@suse.cz> - 2017-01-27 12:20 +0100

csiph-web