From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38A8C28CF42; Thu, 27 Nov 2025 15:03:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764255834; cv=none; b=kDri/WzXQnZOOwAR2CldnDTbawIFaU7k+gleoT8u2IdS8akZIC5MCUmtCKQ5+noikbFtLKIMlCiWksgl7cHkNOnIloBBN2Ycoew44+e52ucuM+4dgJr8NNZ3CCqX0sJZ0sOuYSc215gB6VvAs6nJsJ4u35gRJWodz2FU3bpts54= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764255834; c=relaxed/simple; bh=u9NJK10RT0rj00azugw2L06yM324WrnRWai+aR2u2Cw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gotAR5wWhoguiVNYR1xobg6cW+Ehy+DffUz5hU3IpNJWbXuMZMf3uVTK/83uKzQDZruF5LJb3xxkPclbbNWwEnDQKWc4hobf0YuMW/cG9EWI3vxYKWqfSx1s93ZAU7X3kUtHj8q5JHJMaSmVK9kayueGJ8q6ONg+YH2tUUqR3r4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lePyBl2N; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lePyBl2N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFA66C4CEF8; Thu, 27 Nov 2025 15:03:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764255834; bh=u9NJK10RT0rj00azugw2L06yM324WrnRWai+aR2u2Cw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lePyBl2NOwH6NCEqIl+26orvjOo40DTONNVNYmIZl/LzxA14E7C+ogh/q6nIKoJFy 3JAqrivFMqdHoJHkYq/Ap37yXV8YsN5uT2VOocBR2C82z0GuNuwJFkxyQEmhVEuav4 hXXLtZqWsXi3jNfoPsOEP5Tng2sh4T94wqvKR32g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+87be6809ed9bf6d718e3@syzkaller.appspotmail.com, David Howells , Shaurya Rane , Steve French , Sasha Levin Subject: [PATCH 6.17 129/175] cifs: fix memory leak in smb3_fs_context_parse_param error path Date: Thu, 27 Nov 2025 15:46:22 +0100 Message-ID: <20251127144047.669295863@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251127144042.945669935@linuxfoundation.org> References: <20251127144042.945669935@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shaurya Rane [ Upstream commit 7e4d9120cfa413dd34f4f434befc5dbe6c38b2e5 ] Add proper cleanup of ctx->source and fc->source to the cifs_parse_mount_err error handler. This ensures that memory allocated for the source strings is correctly freed on all error paths, matching the cleanup already performed in the success path by smb3_cleanup_fs_context_contents(). Pointers are also set to NULL after freeing to prevent potential double-free issues. This change fixes a memory leak originally detected by syzbot. The leak occurred when processing Opt_source mount options if an error happened after ctx->source and fc->source were successfully allocated but before the function completed. The specific leak sequence was: 1. ctx->source = smb3_fs_context_fullpath(ctx, '/') allocates memory 2. fc->source = kstrdup(ctx->source, GFP_KERNEL) allocates more memory 3. A subsequent error jumps to cifs_parse_mount_err 4. The old error handler freed passwords but not the source strings, causing the memory to leak. This issue was not addressed by commit e8c73eb7db0a ("cifs: client: fix memory leak in smb3_fs_context_parse_param"), which only fixed leaks from repeated fsconfig() calls but not this error path. Patch updated with minor change suggested by kernel test robot Reported-by: syzbot+87be6809ed9bf6d718e3@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=87be6809ed9bf6d718e3 Fixes: 24e0a1eff9e2 ("cifs: switch to new mount api") Reviewed-by: David Howells Signed-off-by: Shaurya Rane Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/smb/client/fs_context.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c index 55ea0ad894449..c9cd00b96cde1 100644 --- a/fs/smb/client/fs_context.c +++ b/fs/smb/client/fs_context.c @@ -1829,6 +1829,10 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, ctx->password = NULL; kfree_sensitive(ctx->password2); ctx->password2 = NULL; + kfree(ctx->source); + ctx->source = NULL; + kfree(fc->source); + fc->source = NULL; return -EINVAL; } -- 2.51.0