diff options
author | David Ahern <dsahern@gmail.com> | 2018-09-10 20:21:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-12 03:08:00 -0400 |
commit | 67edf21e5adfd336f2ff08668eb09850943666d3 (patch) | |
tree | b0bb1659585480d3669539da7fd790cee1c03b5c /drivers/scsi | |
parent | 1fb0d4e8ddb1b64d6efbd01e44f8994644521419 (diff) |
scsi: libcxgbi: fib6_ino reference in rt6_info is rcu protected
The fib6_info reference in rt6_info is rcu protected. Add a helper
to extract prefsrc from and update cxgbi_check_route6 to use it.
Fixes: 0153167aebd0 ("net/ipv6: Remove rt6i_prefsrc")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/cxgbi/libcxgbi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c index 6b3ea50c594e..75f876409fb9 100644 --- a/drivers/scsi/cxgbi/libcxgbi.c +++ b/drivers/scsi/cxgbi/libcxgbi.c | |||
@@ -784,7 +784,8 @@ cxgbi_check_route6(struct sockaddr *dst_addr, int ifindex) | |||
784 | csk->mtu = mtu; | 784 | csk->mtu = mtu; |
785 | csk->dst = dst; | 785 | csk->dst = dst; |
786 | 786 | ||
787 | if (!rt->from || ipv6_addr_any(&rt->from->fib6_prefsrc.addr)) { | 787 | rt6_get_prefsrc(rt, &pref_saddr); |
788 | if (ipv6_addr_any(&pref_saddr)) { | ||
788 | struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); | 789 | struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); |
789 | 790 | ||
790 | err = ipv6_dev_get_saddr(&init_net, idev ? idev->dev : NULL, | 791 | err = ipv6_dev_get_saddr(&init_net, idev ? idev->dev : NULL, |
@@ -794,8 +795,6 @@ cxgbi_check_route6(struct sockaddr *dst_addr, int ifindex) | |||
794 | &daddr6->sin6_addr); | 795 | &daddr6->sin6_addr); |
795 | goto rel_rt; | 796 | goto rel_rt; |
796 | } | 797 | } |
797 | } else { | ||
798 | pref_saddr = rt->from->fib6_prefsrc.addr; | ||
799 | } | 798 | } |
800 | 799 | ||
801 | csk->csk_family = AF_INET6; | 800 | csk->csk_family = AF_INET6; |