Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b48ab22 authored by Reiter Wolfgang's avatar Reiter Wolfgang Committed by David S. Miller
Browse files

drop_monitor: consider inserted data in genlmsg_end 



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: default avatarReiter Wolfgang <wr0112358@gmail.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 096de2f8

net/core/drop_monitor.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

}