Commit 302fc6bb authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Paolo Abeni
Browse files

phonet: Pass ifindex to fill_route(). 



We will convert route_doit() to RCU.

route_doit() will call rtm_phonet_notify() outside of RCU due
to GFP_KERNEL, so dev will not be available in fill_route().

Let's pass ifindex directly to fill_route().

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent b7d2fc9a

net/phonet/pn_netlink.c

+6 −6
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) 


/* Routes handling */



static int fill_route(struct sk_buff *skb, struct net_device *dev, u8 dst,

static int fill_route(struct sk_buff *skb, u32 ifindex, u8 dst,

		      u32 portid, u32 seq, int event)

{

	struct rtmsg *rtm;
@@ -190,8 +190,7 @@ static int fill_route(struct sk_buff *skb, struct net_device *dev, u8 dst, 
	rtm->rtm_scope = RT_SCOPE_UNIVERSE;

	rtm->rtm_type = RTN_UNICAST;

	rtm->rtm_flags = 0;

	if (nla_put_u8(skb, RTA_DST, dst) ||

	    nla_put_u32(skb, RTA_OIF, READ_ONCE(dev->ifindex)))

	if (nla_put_u8(skb, RTA_DST, dst) || nla_put_u32(skb, RTA_OIF, ifindex))

		goto nla_put_failure;

	nlmsg_end(skb, nlh);

	return 0;
@@ -210,7 +209,8 @@ void rtm_phonet_notify(int event, struct net_device *dev, u8 dst) 
			nla_total_size(1) + nla_total_size(4), GFP_KERNEL);

	if (skb == NULL)

		goto errout;

	err = fill_route(skb, dev, dst, 0, 0, event);



	err = fill_route(skb, dev->ifindex, dst, 0, 0, event);

	if (err < 0) {

		WARN_ON(err == -EMSGSIZE);

		kfree_skb(skb);
@@ -286,7 +286,7 @@ static int route_dumpit(struct sk_buff *skb, struct netlink_callback *cb) 
		if (!dev)

			continue;



		err = fill_route(skb, dev, addr << 2,

		err = fill_route(skb, READ_ONCE(dev->ifindex), addr << 2,

				 NETLINK_CB(cb->skb).portid,

				 cb->nlh->nlmsg_seq, RTM_NEWROUTE);

		if (err < 0)