Netdev List
 help / color / mirror / Atom feed
From: Christoph Paasch <cpaasch@apple.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk>,
	Christoph Hellwig <hch@lst.de>
Subject: [PATCH] devinet_ioctl(): Set ret to 0 when breaking out of the switch-case
Date: Sun, 28 Jan 2018 20:48:07 -0800	[thread overview]
Message-ID: <20180129044807.46975-1-cpaasch@apple.com> (raw)

Commit 03aef17bb79b ("devinet_ioctl(): take copyin/copyout to caller")
introduced a regression when using ifconfig. ifconfig doesn't show the
address anymore. The reason is that the above patch changed the flow in
devinet_ioctl(), where we break; and end up returning ret. ret however
is set to -EADDRNOTAVAIL, which later on prevents the copy_to_user() in
inet_ioctl().

Thus, when we break in devinet_ioctl() we have to set ret to 0 to
properly return out of devinet_ioctl.

Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Fixes: 03aef17bb79b ("devinet_ioctl(): take copyin/copyout to caller")
Signed-off-by: Christoph Paasch <cpaasch@apple.com>
---
 net/ipv4/devinet.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index e056c0067f2c..942dbc73def0 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1049,18 +1049,22 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)
 	switch (cmd) {
 	case SIOCGIFADDR:	/* Get interface address */
 		sin->sin_addr.s_addr = ifa->ifa_local;
+		ret = 0;
 		break;
 
 	case SIOCGIFBRDADDR:	/* Get the broadcast address */
 		sin->sin_addr.s_addr = ifa->ifa_broadcast;
+		ret = 0;
 		break;
 
 	case SIOCGIFDSTADDR:	/* Get the destination address */
 		sin->sin_addr.s_addr = ifa->ifa_address;
+		ret = 0;
 		break;
 
 	case SIOCGIFNETMASK:	/* Get the netmask for the interface */
 		sin->sin_addr.s_addr = ifa->ifa_mask;
+		ret = 0;
 		break;
 
 	case SIOCSIFFLAGS:
-- 
2.16.1

             reply	other threads:[~2018-01-29  4:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-29  4:48 Christoph Paasch [this message]
2018-01-29  5:16 ` [PATCH] devinet_ioctl(): Set ret to 0 when breaking out of the switch-case Christoph Paasch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180129044807.46975-1-cpaasch@apple.com \
    --to=cpaasch@apple.com \
    --cc=davem@davemloft.net \
    --cc=hch@lst.de \
    --cc=netdev@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox