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

Commit 4200462d authored by Reiter Wolfgang's avatar Reiter Wolfgang Committed by David S. Miller
Browse files

drop_monitor: add missing call to genlmsg_end 



Update nlmsg_len field with genlmsg_end to enable userspace processing
using nlmsg_next helper. Also adds error handling.

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 e1a3a60a

net/core/drop_monitor.c

+24 −9
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ static struct sk_buff *reset_per_cpu_data(struct per_cpu_dm_data *data) 
	struct nlattr *nla;

	struct sk_buff *skb;

	unsigned long flags;

	void *msg_header;



	al = sizeof(struct net_dm_alert_msg);

	al += dm_hit_limit * sizeof(struct net_dm_drop_point);
@@ -82,17 +83,31 @@ static struct sk_buff *reset_per_cpu_data(struct per_cpu_dm_data *data) 


	skb = genlmsg_new(al, GFP_KERNEL);



	if (skb) {

		genlmsg_put(skb, 0, 0, &net_drop_monitor_family,

	if (!skb)

		goto err;



	msg_header = genlmsg_put(skb, 0, 0, &net_drop_monitor_family,

				 0, NET_DM_CMD_ALERT);

	if (!msg_header) {

		nlmsg_free(skb);

		skb = NULL;

		goto err;

	}

	nla = nla_reserve(skb, NLA_UNSPEC,

			  sizeof(struct net_dm_alert_msg));

	if (!nla) {

		nlmsg_free(skb);

		skb = NULL;

		goto err;

	}

	msg = nla_data(nla);

	memset(msg, 0, al);

	} else {

		mod_timer(&data->send_timer, jiffies + HZ / 10);

	}

	genlmsg_end(skb, msg_header);

	goto out;



err:

	mod_timer(&data->send_timer, jiffies + HZ / 10);

out:

	spin_lock_irqsave(&data->lock, flags);

	swap(data->skb, skb);

	spin_unlock_irqrestore(&data->lock, flags);