xxx: fixup

Takes care of:

[   54.282636] general protection fault, probably for non-canonical address 0xfbd59c0000000024: 0000 [#1] PREEMPT SMP KASAN
[   54.283523] KASAN: maybe wild-memory-access in range [0xdead000000000120-0xdead000000000127]
[   54.284192] CPU: 1 PID: 310 Comm: ip Not tainted 5.10.0-rc7-custom-03411-g853a5ede0e9f-dirty torvalds#532
[   54.284880] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-1.fc33 04/01/2014
[   54.285574] RIP: 0010:lwtunnel_get_encap_size+0x2c/0x3c0
[   54.285999] Code: 44 00 00 41 54 55 48 89 fd 53 e8 af b4 33 fe 48 85 ed 74 3f e8 a5 b4 33 fe 48 89 ea 48 b8 00 00 00 00 00 fc ff df 48 c1 ea 03 <0f> b6 04 02 84 c0 74 08 3c 01 0f 8e 1f 03 00 00 0f b7 45 00 bf 07
[   54.287591] RSP: 0018:ffffc900017973a0 EFLAGS: 00010a06
[   54.288320] RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffffffff86692cbb
[   54.289070] RDX: 1bd5a00000000024 RSI: 0000000000000000 RDI: dead000000000122
[   54.289645] RBP: dead000000000122 R08: 0000000000000001 R09: 0000000000000000
[   54.290249] R10: 0000000000000001 R11: 0000000000000001 R12: dead000000000122
[   54.290799] R13: dffffc0000000000 R14: 0000000000000000 R15: ffffed10201f41ac
[   54.291353] FS:  00007fac2f6e4e80(0000) GS:ffff8881f6e00000(0000) knlGS:0000000000000000
[   54.291974] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[   54.292430] CR2: 000000000134b918 CR3: 0000000100d77003 CR4: 0000000000370ee0
[   54.292980] Call Trace:
[   54.293200]  rtmsg_fib+0x527/0xb80
[   54.294229]  fib_table_insert+0x70e/0x1b20
[   54.296035]  inet_rtm_newroute+0x10e/0x1f0
[   54.297064]  rtnetlink_rcv_msg+0x4a7/0xb60
[   54.297723]  netlink_rcv_skb+0x14d/0x430
[   54.298992]  netlink_unicast+0x539/0x7e0
[   54.299966]  netlink_sendmsg+0x8b8/0xdc0
[   54.300959]  ____sys_sendmsg+0x7cb/0x950
[   54.302304]  ___sys_sendmsg+0xf8/0x170
[   54.304374]  __sys_sendmsg+0xea/0x1b0
[   54.305458]  do_syscall_64+0x2d/0x40
[   54.305750]  entry_SYSCALL_64_after_hwframe+0x44/0xa9
[   54.306158] RIP: 0033:0x7fac2f8bce57
[   54.306451] Code: 0c 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10
[   54.307879] RSP: 002b:00007ffe790873f8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e
[   54.308475] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007fac2f8bce57
[   54.309031] RDX: 0000000000000000 RSI: 00007ffe79087460 RDI: 0000000000000003
[   54.309652] RBP: 000000005fd8ad54 R08: 0000000000000001 R09: 0000000000000001
[   54.310435] R10: 00007fac2f930ac0 R11: 0000000000000246 R12: 0000000000000001
[   54.311050] R13: 0000000000000000 R14: 0000000000000000 R15: 000000000048b540
[   54.311690] Modules linked in:
[   54.312060] ---[ end trace 9470f57d4370cfc6 ]---

Signed-off-by: Ido Schimmel <idosch@nvidia.com>

include/net/nexthop.h

@@ -290,7 +290,7 @@ static inline unsigned int nexthop_num_path(const struct nexthop *nh)
 		struct nh_group *nh_grp;
 
 		nh_grp = rcu_dereference_rtnl(nh->nh_grp);
-		if (nh_grp->mpath)
+		if (nh_grp->mpath || nh_grp->resilient)
 			rc = nh_grp->num_nh;
 	}
 
@@ -371,7 +371,7 @@ struct fib_nh_common *nexthop_fib_nhc(struct nexthop *nh, int nhsel)
 		struct nh_group *nh_grp;
 
 		nh_grp = rcu_dereference_rtnl(nh->nh_grp);
-		if (nh_grp->mpath) {
+		if (nh_grp->mpath || nh_grp->resilient) {
 			nh = nexthop_mpath_select(nh_grp, nhsel);
 			if (!nh)
 				return NULL;