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 D257C73728; Mon, 29 Jan 2024 17:15:30 +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=1706548530; cv=none; b=egbJCUMVMmILDET4xNDBg8s4jREolvQZ73MDhfMom6l3cQM72buCRCvByxXfjteKLTPusqWYx3KxS8LJC6c/TXlv6AGVt2NdBck78iArLr8p7g8FVtTaHOhTCNG4m0UYrV3tzMyENcMbVWmhuQCxZkUtwByytFNPHHzPyhJtyPQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548530; c=relaxed/simple; bh=8VwUWIy5XSCgzsBkHxPN/nk/Xr8jpNmISHAI+BYgdSo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iKxFgU98VLJPPspv1fRvKP6YbVk5mDkozpab/4/6zkVwgLakbeGJcFchLAk7xKQsDWx9w47eIEOnFsaLiPZh3lJ4jX11iMvF7tDTUHriiEA29B+rn/JDTPHyX5uw80+iXL9dCGOsRbZw9Gx6spNXVH5/imPIM5L7/EMx4yldeR4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QtsIrYNN; 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="QtsIrYNN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96F6FC433F1; Mon, 29 Jan 2024 17:15:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706548530; bh=8VwUWIy5XSCgzsBkHxPN/nk/Xr8jpNmISHAI+BYgdSo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QtsIrYNNRm7uX6GKPS5pWe9lSJkLvNUXpNRavG1mreoFUpCCC4IfSz4AhZVo5o8qL gfHUmZcAgaWTJ2tH+Da1PQ085JN9vcuk7VgRZ5ueZPV53vXC8ReI7ykCKNrfTXtwWJ HQhAYo86USGG/Ek1PwUaNv7kbVJEDkFFGA590y7E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Namjae Jeon , Steve French Subject: [PATCH 6.6 141/331] ksmbd: fix potential circular locking issue in smb2_set_ea() Date: Mon, 29 Jan 2024 09:03:25 -0800 Message-ID: <20240129170019.066496520@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129170014.969142961@linuxfoundation.org> References: <20240129170014.969142961@linuxfoundation.org> User-Agent: quilt/0.67 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Namjae Jeon [ Upstream commit 6fc0a265e1b932e5e97a038f99e29400a93baad0 ] smb2_set_ea() can be called in parent inode lock range. So add get_write argument to smb2_set_ea() not to call nested mnt_want_write(). Signed-off-by: Namjae Jeon Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/smb/server/smb2pdu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -2323,11 +2323,12 @@ out: * @eabuf: set info command buffer * @buf_len: set info command buffer length * @path: dentry path for get ea + * @get_write: get write access to a mount * * Return: 0 on success, otherwise error */ static int smb2_set_ea(struct smb2_ea_info *eabuf, unsigned int buf_len, - const struct path *path) + const struct path *path, bool get_write) { struct mnt_idmap *idmap = mnt_idmap(path->mnt); char *attr_name = NULL, *value; @@ -3015,7 +3016,7 @@ int smb2_open(struct ksmbd_work *work) rc = smb2_set_ea(&ea_buf->ea, le32_to_cpu(ea_buf->ccontext.DataLength), - &path); + &path, false); if (rc == -EOPNOTSUPP) rc = 0; else if (rc) @@ -5992,7 +5993,7 @@ static int smb2_set_info_file(struct ksm return -EINVAL; return smb2_set_ea((struct smb2_ea_info *)req->Buffer, - buf_len, &fp->filp->f_path); + buf_len, &fp->filp->f_path, true); } case FILE_POSITION_INFORMATION: {