net: Adjustment parameters in rtnl_notify()
Subsystems (6)
PATCH 2/4 net: Adjustment parameters in rtnl_notify()
The fifth parameter alread modify from 'struct nlmsghdr *nlh' to 'int report', just adjustment them.
Add the case the nlh variable is NULL in nlmsg_report().
--- include/net/netlink.h | 5 ++--- net/bridge/br_fdb.c | 2 +- net/bridge/br_mdb.c | 4 ++-- net/bridge/br_netlink.c | 2 +- net/bridge/br_vlan.c | 2 +- net/core/fib_rules.c | 2 +- net/core/neighbour.c | 2 +- net/core/net_namespace.c | 2 +- net/core/rtnetlink.c | 6 +++--- net/dcb/dcbnl.c | 2 +- net/decnet/dn_dev.c | 2 +- net/decnet/dn_table.c | 2 +- net/ipv4/devinet.c | 4 ++-- net/ipv4/fib_semantics.c | 2 +- net/ipv4/fib_trie.c | 2 +- net/ipv4/ipmr.c | 4 ++-- net/ipv4/nexthop.c | 4 ++-- net/ipv6/addrconf.c | 8 ++++---- net/ipv6/ip6mr.c | 4 ++-- net/ipv6/ndisc.c | 2 +- net/ipv6/route.c | 9 +++++---- net/mpls/af_mpls.c | 4 ++-- net/phonet/pn_netlink.c | 4 ++-- net/wireless/wext-core.c | 2 +- 24 files changed, 41 insertions(+), 41 deletions(-)
include/net/netlink.h +2 -3
@@ -875,8 +875,6 @@ static inline int nlmsg_validate_deprecated(const struct nlmsghdr *nlh, policy, NL_VALIDATE_LIBERAL, extack); } - -/** * nlmsg_report - need to report back to application? * @nlh: netlink message header
@@ -885,7 +883,8 @@ static inline int nlmsg_validate_deprecated(const struct nlmsghdr *nlh,*/ static inline int nlmsg_report (const struct nlmsghdr *nlh) { -return !!(nlh->nlmsg_flags &NLM_F_ECHO ); + +return nlh ? !!(nlh->nlmsg_flags &NLM_F_ECHO ) :0 ; }/**
net/bridge/br_fdb.c +1 -1
@@ -816,7 +816,7 @@ static void fdb_notify(struct net_bridge *br,kfree_skb (skb); goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_NEIGH ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_NEIGH ,0 ,GFP_ATOMIC );return ; errout:rtnl_set_sk_err (net,RTNLGRP_NEIGH , err);
net/bridge/br_mdb.c +2 -2
@@ -773,7 +773,7 @@ void br_mdb_notify(struct net_device *dev, goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_MDB ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_MDB ,0 ,GFP_ATOMIC );return ; errout:rtnl_set_sk_err (net,RTNLGRP_MDB , err);
@@ -839,7 +839,7 @@ void br_rtr_notify(struct net_device *dev, struct net_bridge_port *port, goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_MDB ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_MDB ,0 ,GFP_ATOMIC );return ; errout:
net/bridge/br_netlink.c +1 -1
@@ -607,7 +607,7 @@ void br_info_notify(int event, const struct net_bridge *br,kfree_skb (skb); goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_LINK ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_LINK ,0 ,GFP_ATOMIC );return ; errout:rtnl_set_sk_err (net,RTNLGRP_LINK , err);
net/bridge/br_vlan.c +1 -1
@@ -1795,7 +1795,7 @@ void br_vlan_notify(const struct net_bridge *br, goto out_err;nlmsg_end (skb, nlh); -rtnl_notify (skb, net,0 ,RTNLGRP_BRVLAN ,NULL ,GFP_KERNEL ); +rtnl_notify (skb, net,0 ,RTNLGRP_BRVLAN ,0 ,GFP_KERNEL );return ; out_err:
net/core/fib_rules.c +1 -1
@@ -1183,7 +1183,7 @@ static void notify_rule_change(int event, struct fib_rule *rule, goto errout; } -rtnl_notify (skb, net, pid, ops->nlgroup, nlh,GFP_KERNEL ); +rtnl_notify (skb, net, pid, ops->nlgroup,nlmsg_report (nlh),GFP_KERNEL );return ; errout:if (err <0 )
net/core/neighbour.c +1 -1
@@ -3370,7 +3370,7 @@ static void __neigh_notify(struct neighbour *n, int type, int flags,kfree_skb (skb); goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_NEIGH ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_NEIGH ,0 ,GFP_ATOMIC );return ; errout:if (err <0 )
net/core/net_namespace.c +1 -1
@@ -1070,7 +1070,7 @@ static void rtnl_net_notifyid(struct net *net, int cmd, int id, u32 portid,if (err <0 ) goto err_out; -rtnl_notify (msg, net, portid,RTNLGRP_NSID , nlh, gfp); +rtnl_notify (msg, net, portid,RTNLGRP_NSID ,nlmsg_report (nlh), gfp);return ; err_out:
net/core/rtnetlink.c +3 -3
@@ -3814,7 +3814,7 @@ void rtmsg_ifinfo_send(struct sk_buff *skb, struct net_device *dev, gfp_t flags) {struct net *net =dev_net (dev); -rtnl_notify (skb, net,0 ,RTNLGRP_LINK ,NULL , flags); +rtnl_notify (skb, net,0 ,RTNLGRP_LINK ,0 , flags); } static void rtmsg_ifinfo_event(int type, struct net_device *dev,
@@ -3908,7 +3908,7 @@ static void rtnl_fdb_notify(struct net_device *dev, u8 *addr, u16 vid, int type, goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_NEIGH ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_NEIGH ,0 ,GFP_ATOMIC );return ; errout:rtnl_set_sk_err (net,RTNLGRP_NEIGH , err);
@@ -4839,7 +4839,7 @@ static int rtnl_bridge_notify(struct net_device *dev)if (!skb->len) goto errout; -rtnl_notify (skb, net,0 ,RTNLGRP_LINK ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_LINK ,0 ,GFP_ATOMIC );return 0 ; errout:WARN_ON (err == -EMSGSIZE );
net/dcb/dcbnl.c +1 -1
@@ -1395,7 +1395,7 @@ static int dcbnl_notify(struct net_device *dev, int event, int cmd, }else {/* End nlmsg and notify broadcast listeners */ nlmsg_end (skb, nlh); -rtnl_notify (skb, net,0 ,RTNLGRP_DCB ,NULL ,GFP_KERNEL ); +rtnl_notify (skb, net,0 ,RTNLGRP_DCB ,0 ,GFP_KERNEL ); }return err;
net/decnet/dn_dev.c +1 -1
@@ -728,7 +728,7 @@ static void dn_ifaddr_notify(int event, struct dn_ifaddr *ifa)kfree_skb (skb); goto errout; } -rtnl_notify (skb, &init_net,0 , RTNLGRP_DECnet_IFADDR,NULL ,GFP_KERNEL ); +rtnl_notify (skb, &init_net,0 , RTNLGRP_DECnet_IFADDR,0 ,GFP_KERNEL );return ; errout:if (err <0 )
net/decnet/dn_table.c +1 -1
@@ -399,7 +399,7 @@ static void dn_rtmsg_fib(int event, struct dn_fib_node *f, int z, u32 tb_id,kfree_skb (skb); goto errout; } -rtnl_notify (skb, &init_net, portid, RTNLGRP_DECnet_ROUTE, nlh,GFP_KERNEL ); +rtnl_notify (skb, &init_net, portid, RTNLGRP_DECnet_ROUTE,nlmsg_report (nlh),GFP_KERNEL );return ; errout:if (err <0 )
net/ipv4/devinet.c +2 -2
@@ -1907,7 +1907,7 @@ static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh,kfree_skb (skb); goto errout; } -rtnl_notify (skb, net, portid,RTNLGRP_IPV4_IFADDR , nlh,GFP_KERNEL ); +rtnl_notify (skb, net, portid,RTNLGRP_IPV4_IFADDR ,nlmsg_report (nlh),GFP_KERNEL );return ; errout:if (err <0 )
@@ -2102,7 +2102,7 @@ void inet_netconf_notify_devconf(struct net *net, int event, int type,kfree_skb (skb); goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_IPV4_NETCONF ,NULL ,GFP_KERNEL ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV4_NETCONF ,0 ,GFP_KERNEL );return ; errout:if (err <0 )
net/ipv4/fib_semantics.c +1 -1
@@ -530,7 +530,7 @@ void rtmsg_fib(int event, __be32 key, struct fib_alias *fa, goto errout; }rtnl_notify (skb, info->nl_net, info->portid,RTNLGRP_IPV4_ROUTE , - info->nlh,GFP_KERNEL ); +nlmsg_report (info->nlh),GFP_KERNEL );return ; errout:if (err <0 )
net/ipv4/fib_trie.c +1 -1
@@ -1078,7 +1078,7 @@ void fib_alias_hw_flags_set(struct net *net, const struct fib_rt_info *fri) goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_IPV4_ROUTE ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV4_ROUTE ,0 ,GFP_ATOMIC ); goto out; errout:
net/ipv4/ipmr.c +2 -2
@@ -2383,7 +2383,7 @@ static void mroute_netlink_event(struct mr_table *mrt, struct mfc_cache *mfc,if (err <0 ) goto errout; -rtnl_notify (skb, net,0 ,RTNLGRP_IPV4_MROUTE ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV4_MROUTE ,0 ,GFP_ATOMIC );return ; errout:
@@ -2447,7 +2447,7 @@ static void igmpmsg_netlink_event(struct mr_table *mrt, struct sk_buff *pkt)nlmsg_end (skb, nlh); -rtnl_notify (skb, net,0 ,RTNLGRP_IPV4_MROUTE_R ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV4_MROUTE_R ,0 ,GFP_ATOMIC );return ; nla_put_failure:
net/ipv4/nexthop.c +2 -2
@@ -857,7 +857,7 @@ static void nexthop_notify(int event, struct nexthop *nh, struct nl_info *info) }rtnl_notify (skb, info->nl_net, info->portid,RTNLGRP_NEXTHOP , - info->nlh,gfp_any ()); +nlmsg_report (info->nlh),gfp_any ());return ; errout:if (err <0 )
@@ -978,7 +978,7 @@ static void nexthop_bucket_notify(struct nh_res_table *res_table, goto errout; } -rtnl_notify (skb, nh->net,0 ,RTNLGRP_NEXTHOP ,NULL ,GFP_KERNEL ); +rtnl_notify (skb, nh->net,0 ,RTNLGRP_NEXTHOP ,0 ,GFP_KERNEL );return ; errout:if (err <0 )
net/ipv6/addrconf.c +4 -4
@@ -583,7 +583,7 @@ void inet6_netconf_notify_devconf(struct net *net, int event, int type,kfree_skb (skb); goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_NETCONF ,NULL ,GFP_KERNEL ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_NETCONF ,0 ,GFP_KERNEL );return ; errout:rtnl_set_sk_err (net,RTNLGRP_IPV6_NETCONF , err);
@@ -5442,7 +5442,7 @@ static void inet6_ifa_notify(int event, struct inet6_ifaddr *ifa)kfree_skb (skb); goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_IFADDR ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_IFADDR ,0 ,GFP_ATOMIC );return ; errout:if (err <0 )
@@ -5979,7 +5979,7 @@ void inet6_ifinfo_notify(int event, struct inet6_dev *idev)kfree_skb (skb); goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_IFINFO ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_IFINFO ,0 ,GFP_ATOMIC );return ; errout:if (err <0 )
@@ -6051,7 +6051,7 @@ static void inet6_prefix_notify(int event, struct inet6_dev *idev,kfree_skb (skb); goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_PREFIX ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_PREFIX ,0 ,GFP_ATOMIC );return ; errout:if (err <0 )
net/ipv6/ip6mr.c +2 -2
@@ -2412,7 +2412,7 @@ static void mr6_netlink_event(struct mr_table *mrt, struct mfc6_cache *mfc,if (err <0 ) goto errout; -rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_MROUTE ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_MROUTE ,0 ,GFP_ATOMIC );return ; errout:
@@ -2476,7 +2476,7 @@ static void mrt6msg_netlink_event(struct mr_table *mrt, struct sk_buff *pkt)nlmsg_end (skb, nlh); -rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_MROUTE_R ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_MROUTE_R ,0 ,GFP_ATOMIC );return ; nla_put_failure:
net/ipv6/ndisc.c +1 -1
@@ -1157,7 +1157,7 @@ static void ndisc_ra_useropt(struct sk_buff *ra, struct nd_opt_hdr *opt) goto nla_put_failure;nlmsg_end (skb, nlh); -rtnl_notify (skb, net,0 ,RTNLGRP_ND_USEROPT ,NULL ,GFP_ATOMIC ); +rtnl_notify (skb, net,0 ,RTNLGRP_ND_USEROPT ,0 ,GFP_ATOMIC );return ; nla_put_failure:
net/ipv6/route.c +5 -4
@@ -3968,7 +3968,7 @@ static int __ip6_del_rt_siblings(struct fib6_info *rt, struct fib6_config *cfg)if (skb) {rtnl_notify (skb, net, info->portid,RTNLGRP_IPV6_ROUTE , - info->nlh,gfp_any ()); +nlmsg_report (info->nlh),gfp_any ()); }return err; }
@@ -6149,7 +6149,7 @@ void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info, goto errout; }rtnl_notify (skb, net, info->portid,RTNLGRP_IPV6_ROUTE , - info->nlh,gfp_any ()); +nlmsg_report (info->nlh),gfp_any ());return ; errout:if (err <0 )
@@ -6175,8 +6175,9 @@ void fib6_rt_update(struct net *net, struct fib6_info *rt,kfree_skb (skb); goto errout; } +rtnl_notify (skb, net, info->portid,RTNLGRP_IPV6_ROUTE , - info->nlh,gfp_any ()); +nlmsg_report (info->nlh),gfp_any ());return ; errout:if (err <0 )
@@ -6227,7 +6228,7 @@ void fib6_info_hw_flags_set(struct net *net, struct fib6_info *f6i, goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_ROUTE ,NULL ,GFP_KERNEL ); +rtnl_notify (skb, net,0 ,RTNLGRP_IPV6_ROUTE ,0 ,GFP_KERNEL );return ; errout:
net/mpls/af_mpls.c +2 -2
@@ -1197,7 +1197,7 @@ static void mpls_netconf_notify_devconf(struct net *net, int event, goto errout; } -rtnl_notify (skb, net,0 ,RTNLGRP_MPLS_NETCONF ,NULL ,GFP_KERNEL ); +rtnl_notify (skb, net,0 ,RTNLGRP_MPLS_NETCONF ,0 ,GFP_KERNEL );return ; errout:if (err <0 )
@@ -2257,7 +2257,7 @@ static void rtmsg_lfib(int event, u32 label, struct mpls_route *rt,kfree_skb (skb); goto errout; } -rtnl_notify (skb, net, portid,RTNLGRP_MPLS_ROUTE , nlh,GFP_KERNEL ); +rtnl_notify (skb, net, portid,RTNLGRP_MPLS_ROUTE ,nlmsg_report (nlh),GFP_KERNEL );return ; errout:
net/phonet/pn_netlink.c +2 -2
@@ -38,7 +38,7 @@ void phonet_address_notify(int event, struct net_device *dev, u8 addr) goto errout; }rtnl_notify (skb,dev_net (dev),0 , -RTNLGRP_PHONET_IFADDR ,NULL ,GFP_KERNEL ); +RTNLGRP_PHONET_IFADDR ,0 ,GFP_KERNEL );return ; errout:rtnl_set_sk_err (dev_net (dev),RTNLGRP_PHONET_IFADDR , err);
@@ -204,7 +204,7 @@ void rtm_phonet_notify(int event, struct net_device *dev, u8 dst) goto errout; }rtnl_notify (skb,dev_net (dev),0 , -RTNLGRP_PHONET_ROUTE ,NULL ,GFP_KERNEL ); +RTNLGRP_PHONET_ROUTE ,0 ,GFP_KERNEL );return ; errout:rtnl_set_sk_err (dev_net (dev),RTNLGRP_PHONET_ROUTE , err);
net/wireless/wext-core.c +1 -1
@@ -350,7 +350,7 @@ void wireless_nlevent_flush(void)down_read (&net_rwsem);for_each_net (net) {while ((skb =skb_dequeue (&net->wext_nlevents))) -rtnl_notify (skb, net,0 ,RTNLGRP_LINK ,NULL , +rtnl_notify (skb, net,0 ,RTNLGRP_LINK ,0 ,GFP_KERNEL ); }up_read (&net_rwsem);
Signature · 1 line
2.32.0
Hi,
Quoted 2 lines · Le maanantaina 19. heinäkuuta 2021, 15.25.06 EEST Yajun Deng a écrit :
The fifth parameter alread modify from 'struct nlmsghdr *nlh' to 'int report', just adjustment them.
I can't see that anywhere in the patch.
Quoted 18 lines
Add the case the nlh variable is NULL in
nlmsg_report().Signed-off-by Yajun Deng <[email protected]>net/phonet/pn_netlink.c +1
-1@@ -38,7 +38,7 @@ void phonet_address_notify(int event, struct net_device *dev, u8 addr) goto errout; }rtnl_notify (skb,dev_net (dev),0 , -RTNLGRP_PHONET_IFADDR ,NULL ,GFP_KERNEL ); +RTNLGRP_PHONET_IFADDR ,0 ,GFP_KERNEL );return ; errout:rtnl_set_sk_err (dev_net (dev),RTNLGRP_PHONET_IFADDR , err);
net/phonet/pn_netlink.c void rtm_phonet_notify(int event, struct net_device · line 210
Quoted 8 lines
net/phonet/pn_netlink.c +1
-1@@ -204,7 +204,7 @@ void rtm_phonet_notify(int event, struct net_device *dev, u8 dst) goto errout; }rtnl_notify (skb,dev_net (dev),0 , -RTNLGRP_PHONET_ROUTE ,NULL ,GFP_KERNEL ); +RTNLGRP_PHONET_ROUTE ,0 ,GFP_KERNEL );return ; errout:rtnl_set_sk_err (dev_net (dev),RTNLGRP_PHONET_ROUTE , err);
Sorry but I don't like to replace explicit NULL pointers with implicitly converted zeroes.
Signature · 2 lines
雷米‧德尼-库尔蒙 http://www.remlab.net/
Quoted 8 lines · Rémi Denis-Courmont
Hi,
Quoted 2 lines · Le maanantaina 19. heinäkuuta 2021, 15.25.06 EEST Yajun Deng a écrit :
The fifth parameter alread modify from 'struct nlmsghdr *nlh' to 'int report', just adjustment them.
I can't see that anywhere in the patch.
I had resent the [PATH 0/4] and [PATH 1/4].
Quoted 34 lines
Quoted 25 lines
Add the case the nlh variable is NULL in
nlmsg_report().Signed-off-by Yajun Deng <[email protected]>net/phonet/pn_netlink.c +1
-1@@ -38,7 +38,7 @@ void phonet_address_notify(int event, struct net_device *dev, u8 addr) goto errout; }rtnl_notify (skb,dev_net (dev),0 , -RTNLGRP_PHONET_IFADDR ,NULL ,GFP_KERNEL ); +RTNLGRP_PHONET_IFADDR ,0 ,GFP_KERNEL );return ;errout:
rtnl_set_sk_err(dev_net(dev), RTNLGRP_PHONET_IFADDR, err);net/phonet/pn_netlink.c +1
-1@@ -204,7 +204,7 @@ void rtm_phonet_notify(int event, struct net_device *dev, u8 dst) goto errout; }rtnl_notify (skb,dev_net (dev),0 , -RTNLGRP_PHONET_ROUTE ,NULL ,GFP_KERNEL ); +RTNLGRP_PHONET_ROUTE ,0 ,GFP_KERNEL );return ;Quoted 2 lines
errout:
rtnl_set_sk_err(dev_net(dev), RTNLGRP_PHONET_ROUTE, err);Sorry but I don't like to replace explicit NULL pointers with implicitly converted zeroes.
--
雷米‧德尼-库尔蒙
http://www.remlab.net