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

Commit 36723873 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

net-sched: fix Action flushing return code 



Flushing must consistently return ENOMEM on failure of any allocation

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f97017cd

net/sched/act_api.c

+2 −2
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid) 
	struct nlattr *tb[TCA_ACT_MAX+1];

	struct nlattr *kind;

	struct tc_action *a = create_a(0);

	int err = -EINVAL;

	int err = -ENOMEM;



	if (a == NULL) {

		printk("tca_action_flush: couldnt create tc_action\n");
@@ -762,7 +762,7 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid) 
	if (!skb) {

		printk("tca_action_flush: failed skb alloc\n");

		kfree(a);

		return -ENOBUFS;

		return err;

	}



	b = skb_tail_pointer(skb);