From: Andrew Morton <akpm@linux-foundation.org>
To: David Rientjes <rientjes@google.com>
Cc: John Stultz <johnstul@us.ibm.com>,
linux-kernel@vger.kernel.org,
John Stultz <john.stultz@linaro.org>
Subject: Re: [patch] fs, proc: truncate /proc/pid/comm writes to first TASK_COMM_LEN bytes
Date: Tue, 9 Apr 2013 13:03:06 -0700 [thread overview]
Message-ID: <20130409130306.4e24a5dd1773c99eaf356db8@linux-foundation.org> (raw)
In-Reply-To: <alpine.DEB.2.02.1304081854440.22640@chino.kir.corp.google.com>
> cc: John Stultz <johnstul@us.ibm.com>
I don't know if that address still works.
On Mon, 8 Apr 2013 18:55:13 -0700 (PDT) David Rientjes <rientjes@google.com> wrote:
> Currently, a write to /proc/pid/write will return the number of bytes
> successfully written. If the actual string is greater than this, the
> remainder of the string will normally be written.
The paragraph is a bit of a head-scratcher. I did some subediting.
> This results in things such as
>
> $ echo -n "abcdefghijklmnopqrs" > /proc/self/comm
>
> to result in
>
> $ cat /proc/$$/comm
> pqrs
hah, that's pretty sad.
> since the final four bytes were written with a second write() since
> TASK_COMM_LEN == 16. This is obviously an undesired result and not
> equivalent to prctl(PR_SET_NAME). The implementation should not need to
> know the definition of TASK_COMM_LEN.
>
> This patch truncates the string to the first TASK_COMM_LEN bytes and
> returns the bytes written as the length of the string written so the
> second write() is suppressed.
>
> $ cat /proc/$$/comm
> abcdefghijklmno
From: David Rientjes <rientjes@google.com>
Subject: fs, proc: truncate /proc/pid/comm writes to first TASK_COMM_LEN bytes
Currently, a write to a procfs file will return the number of bytes
successfully written. If the actual string is longer than this, the
remainder of the string will not be be written and userspace will complete
the operation by issuing additional write()s.
Hence
$ echo -n "abcdefghijklmnopqrs" > /proc/self/comm
results in
$ cat /proc/$$/comm
pqrs
since the final four bytes were written with a second write() since
TASK_COMM_LEN == 16. This is obviously an undesired result and not
equivalent to prctl(PR_SET_NAME). The implementation should not need to
know the definition of TASK_COMM_LEN.
This patch truncates the string to the first TASK_COMM_LEN bytes and
returns the bytes written as the length of the string written so the
second write() is suppressed.
$ cat /proc/$$/comm
abcdefghijklmno
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/proc/base.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN fs/proc/base.c~fs-proc-truncate-proc-pid-comm-writes-to-first-task_comm_len-bytes fs/proc/base.c
--- a/fs/proc/base.c~fs-proc-truncate-proc-pid-comm-writes-to-first-task_comm_len-bytes
+++ a/fs/proc/base.c
@@ -1347,11 +1347,10 @@ static ssize_t comm_write(struct file *f
struct inode *inode = file_inode(file);
struct task_struct *p;
char buffer[TASK_COMM_LEN];
+ const size_t maxlen = sizeof(buffer) - 1;
memset(buffer, 0, sizeof(buffer));
- if (count > sizeof(buffer) - 1)
- count = sizeof(buffer) - 1;
- if (copy_from_user(buffer, buf, count))
+ if (copy_from_user(buffer, buf, count > maxlen ? maxlen : count))
return -EFAULT;
p = get_proc_task(inode);
_
next prev parent reply other threads:[~2013-04-09 20:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 1:55 [patch] fs, proc: truncate /proc/pid/comm writes to first TASK_COMM_LEN bytes David Rientjes
2013-04-09 20:03 ` Andrew Morton [this message]
2013-04-09 20:11 ` John Stultz
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=20130409130306.4e24a5dd1773c99eaf356db8@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=john.stultz@linaro.org \
--cc=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rientjes@google.com \
/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).