ipx: call ipxitf_put() in ioctl error path

commit ee0d8d8482345ff97a75a7d747efc309f13b0d80 upstream.

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 8c06a50..a26ed1e 100644 (file)
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -1194,11 +1194,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));
                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)))
                if (copy_to_user(arg, &ifr, sizeof(ifr)))

-                       break;
+                       rc = -EFAULT;

                ipxitf_put(ipxif);
                ipxitf_put(ipxif);

-               rc = 0;

                break;
        }
        case SIOCAIPXITFCRT:
                break;
        }
        case SIOCAIPXITFCRT: