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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 F0F5CC32750 for ; Fri, 2 Aug 2019 09:58:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCB96217D7 for ; Fri, 2 Aug 2019 09:58:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739889; bh=7J4NevQEDGEPtf/ckBWrQom8P8RdGj5GHzF6XGaJ7zQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=terM8gZg+lhcjudW6cmSIYdrLBIB708Oj853g3Q6Y/UTK6XcUYIyrG+IU97f8SCno 8mIXd8OtRbobylJSIE9JUj0mxNEP40nQXffu/CMILuNSIOuN6qechsrvX5595tUqdN 5U1Eem5whJ6Qe6SVEZDYsc2X8MF2K1XtTN5GkZFU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407056AbfHBJ6I (ORCPT ); Fri, 2 Aug 2019 05:58:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:37620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407036AbfHBJ6G (ORCPT ); Fri, 2 Aug 2019 05:58:06 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 5D6EF217D7; Fri, 2 Aug 2019 09:58:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739885; bh=7J4NevQEDGEPtf/ckBWrQom8P8RdGj5GHzF6XGaJ7zQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wKY6hFkZwaN81WGRTcKjvGO4QBdpIMGoezwYc2TynM+B9Rdjds6vXQaL9aVdlqBSN CEtQnkPGL7EYXbQ8w5aAVBDeyZnLpCTvbjW6jhfLM4VRLlm6eC6CRlF8fox2yej8Xv yzMbIsOA2zoDPRQyIu/Ccjn77WQfTLqHEhy3Xnic= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+7fe11b49c1cc30e3fce2@syzkaller.appspotmail.com, Benjamin Coddington , Trond Myklebust Subject: [PATCH 5.2 09/20] NFS: Cleanup if nfs_match_client is interrupted Date: Fri, 2 Aug 2019 11:40:03 +0200 Message-Id: <20190802092100.101534861@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092055.131876977@linuxfoundation.org> References: <20190802092055.131876977@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Benjamin Coddington commit 9f7761cf0409465075dadb875d5d4b8ef2f890c8 upstream. Don't bail out before cleaning up a new allocation if the wait for searching for a matching nfs client is interrupted. Memory leaks. Reported-by: syzbot+7fe11b49c1cc30e3fce2@syzkaller.appspotmail.com Fixes: 950a578c6128 ("NFS: make nfs_match_client killable") Signed-off-by: Benjamin Coddington Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -406,10 +406,10 @@ struct nfs_client *nfs_get_client(const clp = nfs_match_client(cl_init); if (clp) { spin_unlock(&nn->nfs_client_lock); - if (IS_ERR(clp)) - return clp; if (new) new->rpc_ops->free_client(new); + if (IS_ERR(clp)) + return clp; return nfs_found_client(cl_init, clp); } if (new) {