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=-11.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY 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 97C82C43387 for ; Mon, 7 Jan 2019 21:25:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E0CA206BB for ; Mon, 7 Jan 2019 21:25:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="OM6Xfob8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726724AbfAGVZa (ORCPT ); Mon, 7 Jan 2019 16:25:30 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:56920 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726535AbfAGVZa (ORCPT ); Mon, 7 Jan 2019 16:25:30 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x07LOs6F029727; Mon, 7 Jan 2019 21:25:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=content-type : mime-version : subject : from : in-reply-to : date : cc : content-transfer-encoding : message-id : references : to; s=corp-2018-07-02; bh=cMrOPGsc6dOKS9ZOZaLRH3Fc/6iRI+wt3IMsqJEh2PU=; b=OM6Xfob855snZHz++owPlI247xg3w0MRzHB4UWVwLkdj9qe7ZPuD+hyxErlPl8VMEI9k HIAYfCJxjMsvdkg+/KY5PClKZrECMm6zVcZM7tDfoysf+/5X/S0B9+tDj0d0fUNcojcy jDjTiBKkhJkiWkewtK1+BjgbC8qvkTZ9PZk+Yc5ZCOC2aPMrp84Zmeq4qZ5Dv41Pbngu +K5ziq75yfVMu6yCVp4SllkeoxlbQ42Mr6Os54c1foDv16Pam2rnZOI5qj6vCdnv4xjz 5Uuj7nv4sKqdTJC2W2KObrDdPwHo7rHb0btH1DxsUOOZe8ilduyBOOGQbmfJanLP2SYL zA== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2ptn7qr1qv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 07 Jan 2019 21:25:25 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x07LPOiT023304 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 7 Jan 2019 21:25:24 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x07LPLlD000444; Mon, 7 Jan 2019 21:25:21 GMT Received: from anon-dhcp-171.1015granger.net (/68.61.232.219) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 07 Jan 2019 13:25:21 -0800 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: Re: [PATCH] xprtrdma: Make rpcrdma_sendctxs_destroy() more robust From: Chuck Lever In-Reply-To: <20190107190806.GA6094@kadam> Date: Mon, 7 Jan 2019 16:25:19 -0500 Cc: Trond Myklebust , Jeff Layton , Anna Schumaker , Linux NFS Mailing List , kernel-janitors@vger.kernel.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <20190107190806.GA6094@kadam> To: Dan Carpenter X-Mailer: Apple Mail (2.3445.9.1) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9129 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901070176 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org > On Jan 7, 2019, at 2:08 PM, Dan Carpenter = wrote: >=20 > There was a double free in the error handling here recently. It was > a bit subtle which function was supposed to call = rpcrdma_sendctxs_destroy() > so it was called in both. >=20 > This patch makes it so we can call rpcrdma_sendctxs_destroy() twice > in a row without crashing. Belt-and-braces. I think the other patch "must" be applied, and this one "should" be applied. Reviewed-by: Chuck Lever > Signed-off-by: Dan Carpenter > --- > net/sunrpc/xprtrdma/verbs.c | 3 +++ > 1 file changed, 3 insertions(+) >=20 > diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c > index 7749a2bf6887..d05f4885548d 100644 > --- a/net/sunrpc/xprtrdma/verbs.c > +++ b/net/sunrpc/xprtrdma/verbs.c > @@ -802,9 +802,12 @@ static void rpcrdma_sendctxs_destroy(struct = rpcrdma_buffer *buf) > { > unsigned long i; >=20 > + if (!buf->rb_sc_ctxs) > + return; > for (i =3D 0; i <=3D buf->rb_sc_last; i++) > kfree(buf->rb_sc_ctxs[i]); > kfree(buf->rb_sc_ctxs); > + buf->rb_sc_ctxs =3D NULL; > } >=20 > static struct rpcrdma_sendctx *rpcrdma_sendctx_create(struct = rpcrdma_ia *ia) > --=20 > 2.17.1 >=20 -- Chuck Lever