On Jul 29, 2013, at 12:15 PM, Dan Carpenter <dan.carpenter@xxxxxxxxxx> 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 <dan.carpenter@xxxxxxxxxx> > > diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c > index 8d48c39..1b7f7ae 100644 > --- a/net/ipv4/devinet.c > +++ b/net/ipv4/devinet.c > @@ -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]? > - 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 = -- Mark Rustad, Networking Division, Intel Corporation -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
