From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27F91C2F3BE for ; Mon, 21 Jan 2019 13:49:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E046420861 for ; Mon, 21 Jan 2019 13:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548078584; bh=p43Xl9zZVgflAsYzopspiSbP7wFH1jtrdkZAX1eLFTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FJFGk+KlFhsImIKvMkUgCKjWLakkhU8U3EsBVZpGydzPPxKIg3vbBIDnf9mRPsI29 1waFso5h9e0kM6P1tqs91ncQxnm1umFnenTXVpGfJ7b709iEcU39xe/LSdSzZbTIEk /EEIz2VpN2mAR1w6TFxEGKrEcfwK/nWqrVTxfc2M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729723AbfAUNtl (ORCPT ); Mon, 21 Jan 2019 08:49:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:60284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730294AbfAUNtg (ORCPT ); Mon, 21 Jan 2019 08:49:36 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 710052063F; Mon, 21 Jan 2019 13:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548078575; bh=p43Xl9zZVgflAsYzopspiSbP7wFH1jtrdkZAX1eLFTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kbM6WTZ7Z9R7duaMBz2DdFZq3K6OFWVGwO0zSOZn3o5HvSFjhNZfVRtppcfxgTZyi 2LU2YZpXidbEUQeu9pnmGCp3/39aJWfFJwvJPOOjRTfGqox4STEBzwmAvzOrOoUTiU FSN7bi87z+F5QOaeDKs29ePI+7JUlZciujIn8FN4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+4b98281f2401ab849f4b@syzkaller.appspotmail.com, "J. Bruce Fields" , Anna Schumaker Subject: [PATCH 4.20 079/111] sunrpc: handle ENOMEM in rpcb_getport_async Date: Mon, 21 Jan 2019 14:43:13 +0100 Message-Id: <20190121122505.061347362@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121122455.819406896@linuxfoundation.org> References: <20190121122455.819406896@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: J. Bruce Fields commit 81c88b18de1f11f70c97f28ced8d642c00bb3955 upstream. 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 Signed-off-by: Anna Schumaker Signed-off-by: Greg Kroah-Hartman --- net/sunrpc/rpcb_clnt.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c @@ -771,6 +771,12 @@ void rpcb_getport_async(struct rpc_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 rpc_put_task(child); return; +bailout_free_args: + kfree(map); bailout_release_client: rpc_release_client(rpcb_clnt); bailout_nofree: