Pārlūkot izejas kodu

net-sched: fix Action flushing return code

Flushing must consistently return ENOMEM on failure of any allocation

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jamal Hadi Salim 16 gadi atpakaļ
vecāks
revīzija
36723873b6
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      net/sched/act_api.c

+ 2 - 2
net/sched/act_api.c

@@ -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 *tb[TCA_ACT_MAX+1];
 	struct nlattr *kind;
 	struct nlattr *kind;
 	struct tc_action *a = create_a(0);
 	struct tc_action *a = create_a(0);
-	int err = -EINVAL;
+	int err = -ENOMEM;
 
 
 	if (a == NULL) {
 	if (a == NULL) {
 		printk("tca_action_flush: couldnt create tc_action\n");
 		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) {
 	if (!skb) {
 		printk("tca_action_flush: failed skb alloc\n");
 		printk("tca_action_flush: failed skb alloc\n");
 		kfree(a);
 		kfree(a);
-		return -ENOBUFS;
+		return err;
 	}
 	}
 
 
 	b = skb_tail_pointer(skb);
 	b = skb_tail_pointer(skb);