mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/net/ipv6/ndisc.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *	Neighbour Discovery for IPv6
3
4
  *	Linux INET6 implementation
..
..
@@ -5,11 +6,6 @@
5
6
  *	Authors:
6
7
  *	Pedro Roque		<roque@di.fc.ul.pt>
7
8
  *	Mike Shaver		<shaver@ingenia.com>
8
- *
9
- *	This program is free software; you can redistribute it and/or
10
- *      modify it under the terms of the GNU General Public License
11
- *      as published by the Free Software Foundation; either version
12
- *      2 of the License, or (at your option) any later version.
13
9
  */
14
10
 
15
11
 /*
..
..
@@ -77,12 +73,15 @@
77
73
 		      const struct net_device *dev,
78
74
 		      __u32 *hash_rnd);
79
75
 static bool ndisc_key_eq(const struct neighbour *neigh, const void *pkey);
76
+static bool ndisc_allow_add(const struct net_device *dev,
77
+			    struct netlink_ext_ack *extack);
80
78
 static int ndisc_constructor(struct neighbour *neigh);
81
79
 static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb);
82
80
 static void ndisc_error_report(struct neighbour *neigh, struct sk_buff *skb);
83
81
 static int pndisc_constructor(struct pneigh_entry *n);
84
82
 static void pndisc_destructor(struct pneigh_entry *n);
85
83
 static void pndisc_redo(struct sk_buff *skb);
84
+static int ndisc_is_multicast(const void *pkey);
86
85
 
87
86
 static const struct neigh_ops ndisc_generic_ops = {
88
87
 	.family =		AF_INET6,
..
..
@@ -117,6 +116,8 @@
117
116
 	.pconstructor =	pndisc_constructor,
118
117
 	.pdestructor =	pndisc_destructor,
119
118
 	.proxy_redo =	pndisc_redo,
119
+	.is_multicast =	ndisc_is_multicast,
120
+	.allow_add  =   ndisc_allow_add,
120
121
 	.id =		"ndisc_cache",
121
122
 	.parms = {
122
123
 		.tbl			= &nd_tbl,
..
..
@@ -392,6 +393,20 @@
392
393
 		return;
393
394
 	addrconf_addr_solict_mult(addr, &maddr);
394
395
 	ipv6_dev_mc_dec(dev, &maddr);
396
+}
397
+
398
+/* called with rtnl held */
399
+static bool ndisc_allow_add(const struct net_device *dev,
400
+			    struct netlink_ext_ack *extack)
401
+{
402
+	struct inet6_dev *idev = __in6_dev_get(dev);
403
+
404
+	if (!idev || idev->cnf.disable_ipv6) {
405
+		NL_SET_ERR_MSG(extack, "IPv6 is disabled on this device");
406
+		return false;
407
+	}
408
+
409
+	return true;
395
410
 }
396
411
 
397
412
 static struct sk_buff *ndisc_alloc_skb(struct net_device *dev,
..
..
@@ -1274,12 +1289,11 @@
1274
1289
 	    !in6_dev->cnf.accept_ra_rtr_pref)
1275
1290
 		pref = ICMPV6_ROUTER_PREF_MEDIUM;
1276
1291
 #endif
1277
-
1292
+	/* routes added from RAs do not use nexthop objects */
1278
1293
 	rt = rt6_get_dflt_router(net, &ipv6_hdr(skb)->saddr, skb->dev);
1279
-
1280
1294
 	if (rt) {
1281
-		neigh = ip6_neigh_lookup(&rt->fib6_nh.nh_gw,
1282
-					 rt->fib6_nh.nh_dev, NULL,
1295
+		neigh = ip6_neigh_lookup(&rt->fib6_nh->fib_nh_gw6,
1296
+					 rt->fib6_nh->fib_nh_dev, NULL,
1283
1297
 					  &ipv6_hdr(skb)->saddr);
1284
1298
 		if (!neigh) {
1285
1299
 			ND_PRINTK(0, err,
..
..
@@ -1290,7 +1304,7 @@
1290
1304
 		}
1291
1305
 	}
1292
1306
 	if (rt && lifetime == 0) {
1293
-		ip6_del_rt(net, rt);
1307
+		ip6_del_rt(net, rt, false);
1294
1308
 		rt = NULL;
1295
1309
 	}
1296
1310
 
..
..
@@ -1308,8 +1322,8 @@
1308
1322
 			return;
1309
1323
 		}
1310
1324
 
1311
-		neigh = ip6_neigh_lookup(&rt->fib6_nh.nh_gw,
1312
-					 rt->fib6_nh.nh_dev, NULL,
1325
+		neigh = ip6_neigh_lookup(&rt->fib6_nh->fib_nh_gw6,
1326
+					 rt->fib6_nh->fib_nh_dev, NULL,
1313
1327
 					  &ipv6_hdr(skb)->saddr);
1314
1328
 		if (!neigh) {
1315
1329
 			ND_PRINTK(0, err,
..
..
@@ -1347,8 +1361,8 @@
1347
1361
 
1348
1362
 		if (rtime && rtime/1000 < MAX_SCHEDULE_TIMEOUT/HZ) {
1349
1363
 			rtime = (rtime*HZ)/1000;
1350
-			if (rtime < HZ/10)
1351
-				rtime = HZ/10;
1364
+			if (rtime < HZ/100)
1365
+				rtime = HZ/100;
1352
1366
 			NEIGH_VAR_SET(in6_dev->nd_parms, RETRANS_TIME, rtime);
1353
1367
 			in6_dev->tstamp = jiffies;
1354
1368
 			send_ifinfo_notify = true;
..
..
@@ -1535,7 +1549,7 @@
1535
1549
 
1536
1550
 	if (!ndopts.nd_opts_rh) {
1537
1551
 		ip6_redirect_no_header(skb, dev_net(skb->dev),
1538
-					skb->dev->ifindex, 0);
1552
+					skb->dev->ifindex);
1539
1553
 		return;
1540
1554
 	}
1541
1555
 
..
..
@@ -1694,6 +1708,11 @@
1694
1708
 	kfree_skb(skb);
1695
1709
 }
1696
1710
 
1711
+static int ndisc_is_multicast(const void *pkey)
1712
+{
1713
+	return ipv6_addr_is_multicast((struct in6_addr *)pkey);
1714
+}
1715
+
1697
1716
 static bool ndisc_suppress_frag_ndisc(struct sk_buff *skb)
1698
1717
 {
1699
1718
 	struct inet6_dev *idev = __in6_dev_get(skb->dev);
..
..
@@ -1771,7 +1790,7 @@
1771
1790
 	case NETDEV_CHANGEADDR:
1772
1791
 		neigh_changeaddr(&nd_tbl, dev);
1773
1792
 		fib6_run_gc(0, net, false);
1774
-		/* fallthrough */
1793
+		fallthrough;
1775
1794
 	case NETDEV_UP:
1776
1795
 		idev = in6_dev_get(dev);
1777
1796
 		if (!idev)
..
..
@@ -1785,6 +1804,8 @@
1785
1804
 		change_info = ptr;
1786
1805
 		if (change_info->flags_changed & IFF_NOARP)
1787
1806
 			neigh_changeaddr(&nd_tbl, dev);
1807
+		if (!netif_carrier_ok(dev))
1808
+			neigh_carrier_down(&nd_tbl, dev);
1788
1809
 		break;
1789
1810
 	case NETDEV_DOWN:
1790
1811
 		neigh_ifdown(&nd_tbl, dev);
..
..
@@ -1821,7 +1842,8 @@
1821
1842
 	}
1822
1843
 }
1823
1844
 
1824
-int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos)
1845
+int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void *buffer,
1846
+		size_t *lenp, loff_t *ppos)
1825
1847
 {
1826
1848
 	struct net_device *dev = ctl->extra1;
1827
1849
 	struct inet6_dev *idev;