2 files changed, 34 insertions, 13 deletions

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 2c2aac4ac721..dc10525e90e7 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1893,6 +1893,7 @@ static int tfilter_notify(struct net *net, struct sk_buff *oskb,
 {
         struct sk_buff *skb;
         u32 portid = oskb ? NETLINK_CB(oskb).portid : 0;
+        int err = 0;
 
         skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
         if (!skb)
@@ -1906,10 +1907,14 @@ static int tfilter_notify(struct net *net, struct sk_buff *oskb,
         }
 
         if (unicast)
-                return netlink_unicast(net->rtnl, skb, portid, MSG_DONTWAIT);
+                err = netlink_unicast(net->rtnl, skb, portid, MSG_DONTWAIT);
+        else
+                err = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
+                                     n->nlmsg_flags & NLM_F_ECHO);
 
-        return rtnetlink_send(skb, net, portid, RTNLGRP_TC,
-                              n->nlmsg_flags & NLM_F_ECHO);
+        if (err > 0)
+                err = 0;
+        return err;
 }
 
 static int tfilter_del_notify(struct net *net, struct sk_buff *oskb,
@@ -1941,12 +1946,15 @@ static int tfilter_del_notify(struct net *net, struct sk_buff *oskb,
         }
 
         if (unicast)
-                return netlink_unicast(net->rtnl, skb, portid, MSG_DONTWAIT);
-
-        err = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
-                             n->nlmsg_flags & NLM_F_ECHO);
+                err = netlink_unicast(net->rtnl, skb, portid, MSG_DONTWAIT);
+        else
+                err = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
+                                     n->nlmsg_flags & NLM_F_ECHO);
         if (err < 0)
                 NL_SET_ERR_MSG(extack, "Failed to send filter delete notification");
+
+        if (err > 0)
+                err = 0;
         return err;
 }
 
@@ -2688,6 +2696,7 @@ static int tc_chain_notify(struct tcf_chain *chain, struct sk_buff *oskb,
         struct tcf_block *block = chain->block;
         struct net *net = block->net;
         struct sk_buff *skb;
+        int err = 0;
 
         skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
         if (!skb)
@@ -2701,9 +2710,14 @@ static int tc_chain_notify(struct tcf_chain *chain, struct sk_buff *oskb,
         }
 
         if (unicast)
-                return netlink_unicast(net->rtnl, skb, portid, MSG_DONTWAIT);
+                err = netlink_unicast(net->rtnl, skb, portid, MSG_DONTWAIT);
+        else
+                err = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
+                                     flags & NLM_F_ECHO);
 
-        return rtnetlink_send(skb, net, portid, RTNLGRP_TC, flags & NLM_F_ECHO);
+        if (err > 0)
+                err = 0;
+        return err;
 }
 
 static int tc_chain_notify_delete(const struct tcf_proto_ops *tmplt_ops,
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 352b46f98440..fb8f138b9776 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1824,6 +1824,7 @@ static int tclass_notify(struct net *net, struct sk_buff *oskb,
 {
         struct sk_buff *skb;
         u32 portid = oskb ? NETLINK_CB(oskb).portid : 0;
+        int err = 0;
 
         skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
         if (!skb)
@@ -1834,8 +1835,11 @@ static int tclass_notify(struct net *net, struct sk_buff *oskb,
                 return -EINVAL;
         }
 
-        return rtnetlink_send(skb, net, portid, RTNLGRP_TC,
-                              n->nlmsg_flags & NLM_F_ECHO);
+        err = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
+                             n->nlmsg_flags & NLM_F_ECHO);
+        if (err > 0)
+                err = 0;
+        return err;
 }
 
 static int tclass_del_notify(struct net *net,
@@ -1866,8 +1870,11 @@ static int tclass_del_notify(struct net *net,
                 return err;
         }
 
-        return rtnetlink_send(skb, net, portid, RTNLGRP_TC,
-                              n->nlmsg_flags & NLM_F_ECHO);
+        err = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
+                             n->nlmsg_flags & NLM_F_ECHO);
+        if (err > 0)
+                err = 0;
+        return err;
 }
 
 #ifdef CONFIG_NET_CLS