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 7DE9F15887F; Tue, 23 Jul 2024 18:32:07 +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=1721759527; cv=none; b=IN5+0s3jYl0s7TGW6ox1hbsmyLZwpVt+kfaACSCEsrn50rFuTJ675Z+xpeIBF3MB9LRjQoCLC6lp8fK0zPbJRBYkrMtBBZm+YIdHzDoC0MUgL4yer8i5jiC2AHbic04LuDSPx4VzuIui3Ze1iptkavi7G34KVvV712TdqC3G3NY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759527; c=relaxed/simple; bh=z4Py9DUoBC2gvOmYX3RMdmHx8z+G+1r9A1n+DmFEJQo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=maKjSV3aVXw10uoDOBGDxOq7AZjifVXcHRneVlz2k6SM0KkEZTpgZslnKVVc4z8agf0GfoVZzTYBm+QsDyW7v39PjRiH4rSHG/sjgK5KSSfrmbLzLiiZqpAkhikn5xCg+vLJWXb450J51iT36GGnCkMdWrv6g292dx4UC+Tv4Sg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gshtk9C0; 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="gshtk9C0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04351C4AF0A; Tue, 23 Jul 2024 18:32:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759527; bh=z4Py9DUoBC2gvOmYX3RMdmHx8z+G+1r9A1n+DmFEJQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gshtk9C08ES8Snw6hZpiC+64ov8Q1VGorAvhyTry6i5/SfEVG8Dz9P4B213S/tIDE BJ93L7BUj5HAxv0By8veHIujg7R3qtnuO9VDvvDGgP7urShiFUgCg2N3peLSa4FEW/ g3ycelgxXTJ/h9lLaKcDtHywiWki9UkWGGpAty58= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zizhi Wo , Baokun Li , Jeff Layton , Jia Zhu , Christian Brauner , Sasha Levin Subject: [PATCH 6.6 041/129] cachefiles: Set object to close if ondemand_id < 0 in copen Date: Tue, 23 Jul 2024 20:23:09 +0200 Message-ID: <20240723180406.375892482@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180404.759900207@linuxfoundation.org> References: <20240723180404.759900207@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: Zizhi Wo [ Upstream commit 4f8703fb3482f92edcfd31661857b16fec89c2c0 ] If copen is maliciously called in the user mode, it may delete the request corresponding to the random id. And the request may have not been read yet. Note that when the object is set to reopen, the open request will be done with the still reopen state in above case. As a result, the request corresponding to this object is always skipped in select_req function, so the read request is never completed and blocks other process. Fix this issue by simply set object to close if its id < 0 in copen. Signed-off-by: Zizhi Wo Signed-off-by: Baokun Li Link: https://lore.kernel.org/r/20240522114308.2402121-11-libaokun@huaweicloud.com Acked-by: Jeff Layton Reviewed-by: Jia Zhu Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/cachefiles/ondemand.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c index c3241cede5289..37489ca2e8571 100644 --- a/fs/cachefiles/ondemand.c +++ b/fs/cachefiles/ondemand.c @@ -182,6 +182,7 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args) xas_store(&xas, NULL); xa_unlock(&cache->reqs); + info = req->object->ondemand; /* fail OPEN request if copen format is invalid */ ret = kstrtol(psize, 0, &size); if (ret) { @@ -201,7 +202,6 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args) goto out; } - info = req->object->ondemand; spin_lock(&info->lock); /* * The anonymous fd was closed before copen ? Fail the request. @@ -241,6 +241,11 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args) wake_up_all(&cache->daemon_pollwq); out: + spin_lock(&info->lock); + /* Need to set object close to avoid reopen status continuing */ + if (info->ondemand_id == CACHEFILES_ONDEMAND_ID_CLOSED) + cachefiles_ondemand_set_object_close(req->object); + spin_unlock(&info->lock); complete(&req->done); return ret; } -- 2.43.0