All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tao Cui <cui.tao@linux.dev>
To: brauner@kernel.org
Cc: jack@suse.cz, kees@kernel.org, cyphar@cyphar.com,
	containers@vger.kernel.org, linux-kernel@vger.kernel.org,
	cuitao@kylinos.cn, cui.tao@linux.dev
Subject: [PATCH 2/2] userns: don't clear the install target map on map_write() failure
Date: Fri, 28 Aug 2026 17:16:59 +0800	[thread overview]
Message-ID: <20260828091659.358700-3-cui.tao@linux.dev> (raw)
In-Reply-To: <20260828091659.358700-1-cui.tao@linux.dev>

From: Tao Cui <cuitao@kylinos.cn>

At the out: label of map_write() the destination map is also cleared
(map->forward = NULL; map->reverse = NULL; map->nr_extents = 0)
whenever the write failed and the extent arrays had to be freed.

However, the destination map is written by the successful install
block above, which has no failure exit; every error path reaches
out: without having touched it.  A second write to a mapped
namespace is also rejected with -EPERM before any parsing happens,
so the clearing can never roll back a previously installed map
either.

The three assignments just zero an already-zero map.  Remove them.

Signed-off-by: Tao Cui <cuitao@kylinos.cn>
---
 kernel/user_namespace.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index e9e04ce167df..cef5e71779f6 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -1104,9 +1104,6 @@ static ssize_t map_write(struct file *file, const char __user *buf,
 	if (ret < 0 && new_map.nr_extents > UID_GID_MAP_MAX_BASE_EXTENTS) {
 		kfree(new_map.forward);
 		kfree(new_map.reverse);
-		map->forward = NULL;
-		map->reverse = NULL;
-		map->nr_extents = 0;
 	}
 
 	mutex_unlock(&userns_state_mutex);
-- 
2.43.0


  parent reply	other threads:[~2026-08-28  9:17 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-28  9:16 [PATCH 0/2] userns: clean up dead code on error paths Tao Cui
2026-08-28  9:16 ` [PATCH 1/2] userns: remove dead key_put() on the create_user_ns() error path Tao Cui
2026-08-28  9:41   ` Jan Kara
2026-08-28 11:45   ` Bradley Morgan
2026-08-28  9:16 ` Tao Cui [this message]
2026-08-28  9:51   ` [PATCH 2/2] userns: don't clear the install target map on map_write() failure Jan Kara
2026-08-31 10:08     ` Christian Brauner
2026-08-31 13:08       ` Tao Cui
2026-08-28 13:34   ` Bradley Morgan
2026-08-31 10:12 ` (subset) [PATCH 0/2] userns: clean up dead code on error paths Christian Brauner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260828091659.358700-3-cui.tao@linux.dev \
    --to=cui.tao@linux.dev \
    --cc=brauner@kernel.org \
    --cc=containers@vger.kernel.org \
    --cc=cuitao@kylinos.cn \
    --cc=cyphar@cyphar.com \
    --cc=jack@suse.cz \
    --cc=kees@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.