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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 61D28C4360F for ; Mon, 25 Feb 2019 21:44:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28C4A20652 for ; Mon, 25 Feb 2019 21:44:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551131059; bh=+Ezxk4Bju/vmiPjHANSiN0WsM6dxPjVJM1c5vYNEfZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nNZyUTf9YjWaIJLKcaYQuBcLfD27je4eOBD4WqbEFASmjomQLmL6JATnd9c8BZKz+ Ts2H5sNjqPpXdIg6i2xAYMD17XkUsQHwU+hCvFL0DJYnPocJg9bQJavdppNSC5z1bZ uNLE2v4tkBcsSArwZvJr9Gbz+gGxWIk5HkN7oy08= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732149AbfBYVa2 (ORCPT ); Mon, 25 Feb 2019 16:30:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:36090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731904AbfBYVaZ (ORCPT ); Mon, 25 Feb 2019 16:30:25 -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 354722184D; Mon, 25 Feb 2019 21:30:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130224; bh=+Ezxk4Bju/vmiPjHANSiN0WsM6dxPjVJM1c5vYNEfZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vr+RkBacvuyW/mpBfNAMKzC235x0+QO1yS8WsrwRusIbh6fxvRR6PBZPuPFZ7ClMU dgZO8ZLXP1v4mrpQT+bj7PEYcc7b2vzmwGdpcGjHcept/wuxyL2/UOnqoJBGDvYO+L ZB2b3XF0aLsun4HXNseJBJtltfl9eCwtBfrkr9zA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Chuck Lever , Anna Schumaker , Sasha Levin Subject: [PATCH 4.20 052/183] xprtrdma: Double free in rpcrdma_sendctxs_create() Date: Mon, 25 Feb 2019 22:10:25 +0100 Message-Id: <20190225195103.330170222@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195054.748060397@linuxfoundation.org> References: <20190225195054.748060397@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. ------------------ [ Upstream commit 6e17f58c486d9554341f70aa5b63b8fbed07b3fa ] The clean up is handled by the caller, rpcrdma_buffer_create(), so this call to rpcrdma_sendctxs_destroy() leads to a double free. Fixes: ae72950abf99 ("xprtrdma: Add data structure to manage RDMA Send arguments") Signed-off-by: Dan Carpenter Reviewed-by: Chuck Lever Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- net/sunrpc/xprtrdma/verbs.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 919fddec01973..dffedf1df02ce 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -912,17 +912,13 @@ static int rpcrdma_sendctxs_create(struct rpcrdma_xprt *r_xprt) for (i = 0; i <= buf->rb_sc_last; i++) { sc = rpcrdma_sendctx_create(&r_xprt->rx_ia); if (!sc) - goto out_destroy; + return -ENOMEM; sc->sc_xprt = r_xprt; buf->rb_sc_ctxs[i] = sc; } return 0; - -out_destroy: - rpcrdma_sendctxs_destroy(buf); - return -ENOMEM; } /* The sendctx queue is not guaranteed to have a size that is a -- 2.19.1