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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 539A9C4332F for ; Sat, 24 Dec 2022 01:34:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236779AbiLXBe3 (ORCPT ); Fri, 23 Dec 2022 20:34:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236689AbiLXBd2 (ORCPT ); Fri, 23 Dec 2022 20:33:28 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACEFB379EF; Fri, 23 Dec 2022 17:31:24 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E0E7A61FA3; Sat, 24 Dec 2022 01:31:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C58CC433D2; Sat, 24 Dec 2022 01:31:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671845483; bh=LGNqtuSIQ2sa068rG6exeuPBkG6eWEpHMY9HQSZqgHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V9WsBAJEGEatSWl+F9w41aUcKHQTtIzzlYt06hzqgvVyK4rX+2gmUVHGWYE8kA5ox 4bY/fqszbWxryRasnhJe0igGVhshhaFS5VC8l//pRXYReKpUdWrwGpPK1RA5oysVM+ 8dtC7WSgd8gU7fjcmt7dRz0ruvpHfooA1Jxv0LYeRfIMQGy/iKhf68As9uwXmtWct4 xL/NQLKnB0WOSM65JCpEf2oiCB0P3qgvtFWpkU/Uj8po6RQZlYwjvQfQHbMyNAZ7NE 9ON1E6vSLIn3dwAAX30pX9rlVnbJXiotEM6ui2od9MC9k53Ox9WmBftxrxqSlEgObN CFDyjSMKORC5g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marios Makassikis , Namjae Jeon , Steve French , Sasha Levin , sfrench@samba.org, linux-cifs@vger.kernel.org Subject: [PATCH AUTOSEL 6.0 15/18] ksmbd: Fix resource leak in smb2_lock() Date: Fri, 23 Dec 2022 20:30:31 -0500 Message-Id: <20221224013034.392810-15-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221224013034.392810-1-sashal@kernel.org> References: <20221224013034.392810-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org From: Marios Makassikis [ Upstream commit 01f6c61bae3d658058ee6322af77acea26a5ee3a ] "flock" is leaked if an error happens before smb2_lock_init(), as the lock is not added to the lock_list to be cleaned up. Signed-off-by: Marios Makassikis Acked-by: Namjae Jeon Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/ksmbd/smb2pdu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c index 7a9497a7b0a3..4e6e55714f4b 100644 --- a/fs/ksmbd/smb2pdu.c +++ b/fs/ksmbd/smb2pdu.c @@ -6835,6 +6835,7 @@ int smb2_lock(struct ksmbd_work *work) if (lock_start > U64_MAX - lock_length) { pr_err("Invalid lock range requested\n"); rsp->hdr.Status = STATUS_INVALID_LOCK_RANGE; + locks_free_lock(flock); goto out; } @@ -6854,6 +6855,7 @@ int smb2_lock(struct ksmbd_work *work) "the end offset(%llx) is smaller than the start offset(%llx)\n", flock->fl_end, flock->fl_start); rsp->hdr.Status = STATUS_INVALID_LOCK_RANGE; + locks_free_lock(flock); goto out; } @@ -6865,6 +6867,7 @@ int smb2_lock(struct ksmbd_work *work) flock->fl_type != F_UNLCK) { pr_err("conflict two locks in one request\n"); err = -EINVAL; + locks_free_lock(flock); goto out; } } @@ -6873,6 +6876,7 @@ int smb2_lock(struct ksmbd_work *work) smb_lock = smb2_lock_init(flock, cmd, flags, &lock_list); if (!smb_lock) { err = -EINVAL; + locks_free_lock(flock); goto out; } } -- 2.35.1