From: Stefan Metzmacher <[email protected]>
To: [email protected]
Cc: Stefan Metzmacher <[email protected]>
Subject: [RFC PATCH 05/10] io-wq: protect against future set_task_comm() overflows.
Date: Mon, 15 Mar 2021 18:01:43 +0100 [thread overview]
Message-ID: <5cee4815c85ea19bca3710e6e5e6a8ca5a72a4be.1615826736.git.metze@samba.org> (raw)
In-Reply-To: <[email protected]>
Signed-off-by: Stefan Metzmacher <[email protected]>
---
fs/io-wq.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/fs/io-wq.c b/fs/io-wq.c
index d6b15a627f9a..5c7d2a8c112e 100644
--- a/fs/io-wq.c
+++ b/fs/io-wq.c
@@ -588,7 +588,19 @@ static bool create_io_worker(struct io_wq *wq, struct io_wqe *wqe, int index)
return false;
}
- sprintf(tsk_comm, "iou-wrk-%d", wq->task_pid);
+ /*
+ * The limit value of pid_max_max/PID_MAX_LIMIT
+ * is 4 * 1024 * 1024 = 4194304.
+ *
+ * TASK_COMM_LEN is 16, so we have 15 chars to fill.
+ *
+ * With "iou-wrk-4194304" we just fit into 15 chars.
+ * If that ever changes we may better add some special
+ * handling for PF_IO_WORKER in proc_task_name(), as that
+ * allows up to 63 chars.
+ */
+ WARN_ON(snprintf(tsk_comm, sizeof(tsk_comm),
+ "iou-wrk-%d", wq->task_pid) >= sizeof(tsk_comm));
set_task_comm(tsk, tsk_comm);
tsk->pf_io_worker = worker;
@@ -780,7 +792,19 @@ static int io_wq_fork_manager(struct io_wq *wq)
if (!IS_ERR(tsk)) {
char tsk_comm[TASK_COMM_LEN];
- sprintf(tsk_comm, "iou-mgr-%d", wq->task_pid);
+ /*
+ * The limit value of pid_max_max/PID_MAX_LIMIT
+ * is 4 * 1024 * 1024 = 4194304.
+ *
+ * TASK_COMM_LEN is 16, so we have 15 chars to fill.
+ *
+ * With "iou-mgr-4194304" we just fit into 15 chars.
+ * If that ever changes we may better add some special
+ * handling for PF_IO_WORKER in proc_task_name(), as that
+ * allows up to 63 chars.
+ */
+ WARN_ON(snprintf(tsk_comm, sizeof(tsk_comm),
+ "iou-mgr-%d", wq->task_pid) >= sizeof(tsk_comm));
set_task_comm(tsk, tsk_comm);
wq->manager = get_task_struct(tsk);
--
2.25.1
next prev parent reply other threads:[~2021-03-15 17:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 23:27 Problems with io_threads Stefan Metzmacher
2021-03-15 17:01 ` [RFC PATCH 00/10] Complete setup before calling wake_up_new_task() and improve task->comm Stefan Metzmacher
2021-03-15 17:01 ` [RFC PATCH 01/10] kernel: always initialize task->pf_io_worker to NULL Stefan Metzmacher
2021-03-15 17:01 ` [RFC PATCH 02/10] io_uring: io_sq_thread() no longer needs to reset current->pf_io_worker Stefan Metzmacher
2021-03-15 17:01 ` [RFC PATCH 03/10] io-wq: call set_task_comm() before wake_up_new_task() Stefan Metzmacher
2021-03-15 17:01 ` [RFC PATCH 04/10] io_uring: complete sq_thread setup before calling wake_up_new_task() Stefan Metzmacher
2021-03-15 17:01 ` Stefan Metzmacher [this message]
2021-03-15 17:01 ` [RFC PATCH 06/10] io_uring: protect against future set_task_comm() overflows Stefan Metzmacher
2021-03-15 17:01 ` [RFC PATCH 07/10] fs/proc: hide PF_IO_WORKER in get_task_cmdline() Stefan Metzmacher
2021-03-15 17:01 ` [RFC PATCH 08/10] fs/proc: protect /proc/<pid>/[task/<tid>]/comm for PF_IO_WORKER Stefan Metzmacher
2021-03-15 17:01 ` [RFC PATCH 09/10] io-wq: add io_wq_worker_comm() helper function for dynamic proc_task_comm() generation Stefan Metzmacher
2021-03-15 17:01 ` [RFC PATCH 10/10] fs/proc: make use of io_wq_worker_comm() for PF_IO_WORKER threads Stefan Metzmacher
2021-03-17 22:42 ` [RFC PATCH 00/10] Complete setup before calling wake_up_new_task() and improve task->comm Jens Axboe
2021-03-17 23:06 ` Stefan Metzmacher
2021-03-17 23:26 ` Jens Axboe
2021-03-20 0:00 ` [PATCH v2 0/5] " Stefan Metzmacher
2021-03-20 0:00 ` [PATCH v2 1/5] kernel: always initialize task->pf_io_worker to NULL Stefan Metzmacher
2021-03-20 0:00 ` [PATCH v2 2/5] io_uring: io_sq_thread() no longer needs to reset current->pf_io_worker Stefan Metzmacher
2021-03-20 0:00 ` [PATCH v2 3/5] io-wq: call set_task_comm() before wake_up_new_task() Stefan Metzmacher
2021-03-20 0:00 ` [PATCH v2 4/5] io_uring: complete sq_thread setup before calling wake_up_new_task() Stefan Metzmacher
2021-03-20 0:00 ` [PATCH v2 5/5] fs/proc: hide PF_IO_WORKER in get_task_cmdline() Stefan Metzmacher
2021-03-20 1:24 ` [PATCH v2 0/5] Complete setup before calling wake_up_new_task() and improve task->comm Jens Axboe
2021-03-20 19:22 ` Stefan Metzmacher
2021-03-20 22:39 ` Jens Axboe
2021-03-19 23:46 ` Problems with io_threads Jens Axboe
2021-03-20 0:25 ` Stefan Metzmacher
2021-03-20 1:20 ` Jens Axboe
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=5cee4815c85ea19bca3710e6e5e6a8ca5a72a4be.1615826736.git.metze@samba.org \
[email protected] \
[email protected] \
/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