]> git.dujemihanovic.xyz Git - linux.git/commitdiff
sunrpc: handle ENOMEM in rpcb_getport_async
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 20 Dec 2018 15:35:11 +0000 (10:35 -0500)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Wed, 2 Jan 2019 17:05:19 +0000 (12:05 -0500)
If we ignore the error we'll hit a null dereference a little later.

Reported-by: syzbot+4b98281f2401ab849f4b@syzkaller.appspotmail.com
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
net/sunrpc/rpcb_clnt.c

index c7872bc138605b3450727ca2c737d1ba8d986564..08b5fa4a2852a9abdef38a2c6115272485aafca7 100644 (file)
@@ -771,6 +771,12 @@ void rpcb_getport_async(struct rpc_task *task)
        case RPCBVERS_3:
                map->r_netid = xprt->address_strings[RPC_DISPLAY_NETID];
                map->r_addr = rpc_sockaddr2uaddr(sap, GFP_ATOMIC);
+               if (!map->r_addr) {
+                       status = -ENOMEM;
+                       dprintk("RPC: %5u %s: no memory available\n",
+                               task->tk_pid, __func__);
+                       goto bailout_free_args;
+               }
                map->r_owner = "";
                break;
        case RPCBVERS_2:
@@ -793,6 +799,8 @@ void rpcb_getport_async(struct rpc_task *task)
        rpc_put_task(child);
        return;
 
+bailout_free_args:
+       kfree(map);
 bailout_release_client:
        rpc_release_client(rpcb_clnt);
 bailout_nofree: