diff options
| author | Reiter Wolfgang <wr0112358@gmail.com> | 2017-01-03 01:39:10 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:27:22 +0000 |
| commit | cf7d840470ee1c68d0f9ced3f4091372f322deee (patch) | |
| tree | 73fc863c5fc0d0927ca4f06cf107f15936c9de47 | |
| parent | e3b654ef5996e289fc50bab4e302751b5bd1f69f (diff) | |
| download | linux-stable-cf7d840470ee1c68d0f9ced3f4091372f322deee.tar.gz linux-stable-cf7d840470ee1c68d0f9ced3f4091372f322deee.tar.bz2 linux-stable-cf7d840470ee1c68d0f9ced3f4091372f322deee.zip | |
drop_monitor: consider inserted data in genlmsg_end
[ 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: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/core/drop_monitor.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c index 1e67abd946aa..add0544a571a 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; } |