ipx: call ipxitf_put() in ioctl error path
diff mbox

Message ID 20170502105853.yz3ny6lyso6isdvx@mwanda
State Accepted
Delegated to: David Miller
Headers show

Commit Message

Dan Carpenter May 2, 2017, 10:58 a.m. UTC
We should call ipxitf_put() if the copy_to_user() fails.

Reported-by: 李强 <liqiang6-s@360.cn>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

David Miller May 2, 2017, 7:35 p.m. UTC | #1
From: Dan Carpenter <dan.carpenter@oracle.com>

Date: Tue, 2 May 2017 13:58:53 +0300

> We should call ipxitf_put() if the copy_to_user() fails.

> 

> Reported-by: 李强 <liqiang6-s@360.cn>

> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>


Applied, thanks Dan.
Kees Cook May 2, 2017, 11:42 p.m. UTC | #2
On Tue, May 2, 2017 at 3:58 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> We should call ipxitf_put() if the copy_to_user() fails.
>
> Reported-by: 李强 <liqiang6-s@360.cn>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
> index 8a9219ff2e77..fa31ef29e3fa 100644
> --- a/net/ipx/af_ipx.c
> +++ b/net/ipx/af_ipx.c
> @@ -1168,11 +1168,10 @@ static int ipxitf_ioctl(unsigned int cmd, void __user *arg)
>                 sipx->sipx_network      = ipxif->if_netnum;
>                 memcpy(sipx->sipx_node, ipxif->if_node,
>                         sizeof(sipx->sipx_node));
> -               rc = -EFAULT;
> +               rc = 0;
>                 if (copy_to_user(arg, &ifr, sizeof(ifr)))
> -                       break;
> +                       rc = -EFAULT;
>                 ipxitf_put(ipxif);
> -               rc = 0;
>                 break;
>         }
>         case SIOCAIPXITFCRT:

This refcount overflow flaw (and resulting use-after-free) appears to
be reachable from unprivileged userspace, though I think it requires
an interface already be configured, so this is likely not much risk to
most users. Someone more familiar with IPX should double-check...

And, of course, I should point out this flaw would have been blocked
entirely by using refcount_t:
https://lkml.org/lkml/2017/3/17/193

And if it didn't require a configured interface, it would be mitigated
with module autoload blocking:
https://lkml.org/lkml/2017/4/19/1088

(Yes, yes, I know both are still being worked on, but this is a good
example to show another case where they'd have been useful.)

-Kees

Patch
diff mbox

diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 8a9219ff2e77..fa31ef29e3fa 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -1168,11 +1168,10 @@  static int ipxitf_ioctl(unsigned int cmd, void __user *arg)
 		sipx->sipx_network	= ipxif->if_netnum;
 		memcpy(sipx->sipx_node, ipxif->if_node,
 			sizeof(sipx->sipx_node));
-		rc = -EFAULT;
+		rc = 0;
 		if (copy_to_user(arg, &ifr, sizeof(ifr)))
-			break;
+			rc = -EFAULT;
 		ipxitf_put(ipxif);
-		rc = 0;
 		break;
 	}
 	case SIOCAIPXITFCRT: