Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30e948a3 authored by Tonghao Zhang's avatar Tonghao Zhang Committed by David S. Miller
Browse files

ipv4: Get the address of interface correctly. 



When using ioctl to get address of interface, we can't
get it anymore. For example, the command is show as below.

	# ifconfig eth0

In the patch ("03aef17b"), the devinet_ioctl does not
return a suitable value, even though we can find it in
the kernel. Then fix it now.

Fixes: 03aef17b ("devinet_ioctl(): take copyin/copyout to caller")
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40ca54e3

net/ipv4/devinet.c

+4 −0
Original line number Diff line number Diff line
@@ -1048,18 +1048,22 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr) 


	switch (cmd) {

	case SIOCGIFADDR:	/* Get interface address */

		ret = 0;

		sin->sin_addr.s_addr = ifa->ifa_local;

		break;



	case SIOCGIFBRDADDR:	/* Get the broadcast address */

		ret = 0;

		sin->sin_addr.s_addr = ifa->ifa_broadcast;

		break;



	case SIOCGIFDSTADDR:	/* Get the destination address */

		ret = 0;

		sin->sin_addr.s_addr = ifa->ifa_address;

		break;



	case SIOCGIFNETMASK:	/* Get the netmask for the interface */

		ret = 0;

		sin->sin_addr.s_addr = ifa->ifa_mask;

		break;