net: remove an unneeded check

PATCH In review Dan Carpenter 4 participants 5 messages Jul 29, 2013 – Aug 6, 2013

Subsystems (4)

Networking Network drivers Kernel janitors IPv4/IPv6

lore

Share & tools

lore

Dan Carpenter

author

2013-07-29 19:15 UTC #0 lore raw

PATCH 1/1 net: remove an unneeded check

"ifa->ifa_label" is an array inside the in_ifaddr struct. It can never be NULL so we can remove this check.

Signed-off-by Dan Carpenter <[email protected]>

net/ipv4/devinet.c +1 -4

index 8d48c39..1b7f7ae 100644
@@ -1124,10 +1124,7 @@ static int inet_gifconf(struct net_device *dev, char __user *buf, int len)
 		if (len < (int) sizeof(ifr))
 			break;
 		memset(&ifr, 0, sizeof(struct ifreq));
-		if (ifa->ifa_label)
-			strcpy(ifr.ifr_name, ifa->ifa_label);
-		else
-			strcpy(ifr.ifr_name, dev->name);
+		strcpy(ifr.ifr_name, ifa->ifa_label);
 
 		(*(struct sockaddr_in *)&ifr.ifr_addr).sin_family = AF_INET;
 		(*(struct sockaddr_in *)&ifr.ifr_addr).sin_addr.s_addr

Jiri Pirko

Reviewed-by on v1 1/1

2013-07-29 21:17 UTC #1 lore raw

Quoted 4 lines · Mon, Jul 29, 2013 at 09:15:19PM CEST, [email protected] wrote:

"ifa->ifa_label" is an array inside the in_ifaddr struct. It can never be NULL so we can remove this check.
Signed-off-by Dan Carpenter <[email protected]>

Reviewed-by Jiri Pirko <[email protected]>

David Miller

maintainer

2013-07-31 02:24 UTC #2 lore raw

In reply to Dan Carpenter

From: Dan Carpenter <[email protected]>
Date: Mon, 29 Jul 2013 22:15:19 +0300

Quoted 4 lines

"ifa->ifa_label" is an array inside the in_ifaddr struct. It can never be NULL so we can remove this check.
Signed-off-by Dan Carpenter <[email protected]>

Yeah this has been like this forever, applied to net-next, thanks Dan.

Rustad, Mark D

2013-08-05 18:18 UTC #3 lore raw

In reply to Dan Carpenter

Quoted 10 lines · Dan Carpenter

"ifa->ifa_label" is an array inside the in_ifaddr struct. It can never be NULL so we can remove this check.
Signed-off-by Dan Carpenter <[email protected]>
net/ipv4/devinet.c +0 -0
index 8d48c39..1b7f7ae 100644

net/ipv4/devinet.c static int inet_gifconf(struct net_device *dev, char __user *buf, int len) · line 1127

Quoted 4 lines

net/ipv4/devinet.c +0 -1

@@ -1124,10 +1124,7 @@ static int inet_gifconf(struct net_device *dev, char __user *buf, int len)
 		if (len < (int) sizeof(ifr))
 			break;
 		memset(&ifr, 0, sizeof(struct ifreq));
-		if (ifa->ifa_label)

Is there any possibility that this was meant to check ifa->ifa_label[0]?

Quoted 7 lines

net/ipv4/devinet.c +1 -3

-			strcpy(ifr.ifr_name, ifa->ifa_label);
-		else
-			strcpy(ifr.ifr_name, dev->name);
+		strcpy(ifr.ifr_name, ifa->ifa_label);
 
 		(*(struct sockaddr_in *)&ifr.ifr_addr).sin_family = AF_INET;
 		(*(struct sockaddr_in *)&ifr.ifr_addr).sin_addr.s_addr

Signature · 1 line

Mark Rustad, Networking Division, Intel Corporation

Dan Carpenter

author

2013-08-06 12:04 UTC #4 lore raw

Quoted 7 lines · Mark D

Quoted 5 lines · Dan Carpenter
"ifa->ifa_label" is an array inside the in_ifaddr struct. It can never be NULL so we can remove this check.
Signed-off-by Dan Carpenter <[email protected]>

Quoted 11 lines

net/ipv4/devinet.c static int inet_gifconf(struct net_device *dev, char __user *buf, int len) · line 1127
Quoted 9 lines
net/ipv4/devinet.c +0 -1
index 8d48c39..1b7f7ae 100644
@@ -1124,10 +1124,7 @@ static int inet_gifconf(struct net_device *dev, char __user *buf, int len)
 		if (len < (int) sizeof(ifr))
 			break;
 		memset(&ifr, 0, sizeof(struct ifreq));
-		if (ifa->ifa_label)
Is there any possibility that this was meant to check ifa->ifa_label[0]?

It has been this way for almost 16 years and no one has complained. I should have put that into the changelog though, you are right.

regards,
dan carpenter