linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yafang Shao <laoar.shao@gmail.com>
To: torvalds@linux-foundation.org
Cc: ebiederm@xmission.com, alexei.starovoitov@gmail.com,
	rostedt@goodmis.org, catalin.marinas@arm.com,
	akpm@linux-foundation.org, penguin-kernel@i-love.sakura.ne.jp,
	linux-mm@kvack.org, linux-fsdevel@vger.kernel.org,
	linux-trace-kernel@vger.kernel.org, audit@vger.kernel.org,
	linux-security-module@vger.kernel.org, selinux@vger.kernel.org,
	bpf@vger.kernel.org, netdev@vger.kernel.org,
	dri-devel@lists.freedesktop.org,
	Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCH v3 05/11] mm/util: Fix possible race condition in kstrdup()
Date: Fri, 21 Jun 2024 10:29:53 +0800	[thread overview]
Message-ID: <20240621022959.9124-6-laoar.shao@gmail.com> (raw)
In-Reply-To: <20240621022959.9124-1-laoar.shao@gmail.com>

In kstrdup(), it is critical to ensure that the dest string is always
NUL-terminated. However, potential race condidtion can occur between a
writer and a reader.

Consider the following scenario involving task->comm:

    reader                    writer

  len = strlen(s) + 1;
                             strlcpy(tsk->comm, buf, sizeof(tsk->comm));
  memcpy(buf, s, len);

In this case, there is a race condition between the reader and the
writer. The reader calculate the length of the string `s` based on the
old value of task->comm. However, during the memcpy(), the string `s`
might be updated by the writer to a new value of task->comm.

If the new task->comm is larger than the old one, the `buf` might not be
NUL-terminated. This can lead to undefined behavior and potential
security vulnerabilities.

Let's fix it by explicitly adding a NUL-terminator.

Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
 mm/util.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mm/util.c b/mm/util.c
index c9e519e6811f..41c7875572ed 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -60,8 +60,14 @@ char *kstrdup(const char *s, gfp_t gfp)
 
 	len = strlen(s) + 1;
 	buf = kmalloc_track_caller(len, gfp);
-	if (buf)
+	if (buf) {
 		memcpy(buf, s, len);
+		/* During memcpy(), the string might be updated to a new value,
+		 * which could be longer than the string when strlen() is
+		 * called. Therefore, we need to add a null termimator.
+		 */
+		buf[len - 1] = '\0';
+	}
 	return buf;
 }
 EXPORT_SYMBOL(kstrdup);
-- 
2.39.1


  parent reply	other threads:[~2024-06-21  2:31 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-21  2:29 [PATCH v3 00/11] Improve the copy of task comm Yafang Shao
2024-06-21  2:29 ` [PATCH v3 01/11] fs/exec: Drop task_lock() inside __get_task_comm() Yafang Shao
2024-06-21  2:29 ` [PATCH v3 02/11] auditsc: Replace memcpy() with __get_task_comm() Yafang Shao
2024-06-21  2:29 ` [PATCH v3 03/11] security: " Yafang Shao
2024-06-21  2:29 ` [PATCH v3 04/11] bpftool: Ensure task comm is always NUL-terminated Yafang Shao
2024-06-21  2:29 ` Yafang Shao [this message]
2024-06-21  2:29 ` [PATCH v3 06/11] mm/util: Deduplicate code in {kstrdup,kstrndup,kmemdup_nul} Yafang Shao
2024-06-21 13:51   ` Simon Horman
2024-06-23  2:26     ` Yafang Shao
2024-06-21 13:57   ` Matthew Wilcox
2024-06-23  2:29     ` Yafang Shao
2024-06-23  3:11       ` Matthew Wilcox
2024-06-23  6:00         ` Yafang Shao
2024-06-21  2:29 ` [PATCH v3 07/11] mm/kmemleak: Replace strncpy() with __get_task_comm() Yafang Shao
2024-06-21  2:29 ` [PATCH v3 08/11] tsacct: " Yafang Shao
2024-06-21  2:29 ` [PATCH v3 09/11] tracing: " Yafang Shao
2024-06-21  4:37   ` Masami Hiramatsu
2024-06-21  2:29 ` [PATCH v3 10/11] net: Replace strcpy() " Yafang Shao
2024-06-21  2:29 ` [PATCH v3 11/11] drm: " Yafang Shao
2024-06-21 16:39   ` Daniel Vetter

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=20240621022959.9124-6-laoar.shao@gmail.com \
    --to=laoar.shao@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=alexei.starovoitov@gmail.com \
    --cc=audit@vger.kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=ebiederm@xmission.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=linux-trace-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=penguin-kernel@i-love.sakura.ne.jp \
    --cc=rostedt@goodmis.org \
    --cc=selinux@vger.kernel.org \
    --cc=torvalds@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).