Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1549469

[PATCH] drop_monitor: consider inserted data in genlmsg_end

Show all headers | View raw

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>
---
 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 f465bad..fb55327 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -102,7 +102,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:
@@ -112,6 +111,13 @@ static struct sk_buff *reset_per_cpu_data(struct per_cpu_dm_data *data)
 	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.9.3

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

Thread

[PATCH] drop_monitor: consider inserted data in genlmsg_end Reiter Wolfgang <wr0112358@gmail.com> - 2017-01-03 01:40 +0100
  Re: [PATCH] drop_monitor: consider inserted data in genlmsg_end Neil Horman <nhorman@tuxdriver.com> - 2017-01-03 14:20 +0100
  Re: [PATCH] drop_monitor: consider inserted data in genlmsg_end David Miller <davem@davemloft.net> - 2017-01-03 16:00 +0100
    Re: [PATCH] drop_monitor: consider inserted data in genlmsg_end Neil Horman <nhorman@tuxdriver.com> - 2017-01-03 17:10 +0100
      Re: [PATCH] drop_monitor: consider inserted data in genlmsg_end David Miller <davem@davemloft.net> - 2017-01-03 17:20 +0100

csiph-web