mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/net/decnet/dn_dev.c
..
..
@@ -160,8 +160,8 @@
160
160
 static int min_priority[1];
161
161
 static int max_priority[] = { 127 }; /* From DECnet spec */
162
162
 
163
-static int dn_forwarding_proc(struct ctl_table *, int,
164
-			void __user *, size_t *, loff_t *);
163
+static int dn_forwarding_proc(struct ctl_table *, int, void *, size_t *,
164
+		loff_t *);
165
165
 static struct dn_dev_sysctl_table {
166
166
 	struct ctl_table_header *sysctl_header;
167
167
 	struct ctl_table dn_dev_vars[5];
..
..
@@ -245,8 +245,7 @@
245
245
 }
246
246
 
247
247
 static int dn_forwarding_proc(struct ctl_table *table, int write,
248
-				void __user *buffer,
249
-				size_t *lenp, loff_t *ppos)
248
+		void *buffer, size_t *lenp, loff_t *ppos)
250
249
 {
251
250
 #ifdef CONFIG_DECNET_ROUTER
252
251
 	struct net_device *dev = table->extra1;
..
..
@@ -463,7 +462,9 @@
463
462
 	switch (cmd) {
464
463
 	case SIOCGIFADDR:
465
464
 		*((__le16 *)sdn->sdn_nodeaddr) = ifa->ifa_local;
466
-		goto rarok;
465
+		if (copy_to_user(arg, ifr, DN_IFREQ_SIZE))
466
+			ret = -EFAULT;
467
+		break;
467
468
 
468
469
 	case SIOCSIFADDR:
469
470
 		if (!ifa) {
..
..
@@ -486,10 +487,6 @@
486
487
 	rtnl_unlock();
487
488
 
488
489
 	return ret;
489
-rarok:
490
-	if (copy_to_user(arg, ifr, DN_IFREQ_SIZE))
491
-		ret = -EFAULT;
492
-	goto done;
493
490
 }
494
491
 
495
492
 struct net_device *dn_dev_get_default(void)
..
..
@@ -583,8 +580,8 @@
583
580
 	if (!net_eq(net, &init_net))
584
581
 		goto errout;
585
582
 
586
-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy,
587
-			  extack);
583
+	err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
584
+				     dn_ifa_policy, extack);
588
585
 	if (err < 0)
589
586
 		goto errout;
590
587
 
..
..
@@ -629,8 +626,8 @@
629
626
 	if (!net_eq(net, &init_net))
630
627
 		return -EINVAL;
631
628
 
632
-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy,
633
-			  extack);
629
+	err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
630
+				     dn_ifa_policy, extack);
634
631
 	if (err < 0)
635
632
 		return err;
636
633
 
..
..
@@ -1363,7 +1360,7 @@
1363
1360
 
1364
1361
 		seq_printf(seq, "%-8s %1s     %04u %04u   %04lu %04lu"
1365
1362
 				"   %04hu    %03d %02x    %-10s %-7s %-7s\n",
1366
-				dev->name ? dev->name : "???",
1363
+				dev->name,
1367
1364
 				dn_type2asc(dn_db->parms.mode),
1368
1365
 				0, 0,
1369
1366
 				dn_db->t3, dn_db->parms.t3,