The patch titled
Subject: proc: somewhat simpler code for /proc/*/cmdline
has been added to the -mm tree. Its filename is
proc-somewhat-simpler-code-for-proc-cmdline.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/proc-somewhat-simpler-code-for-proc-cmdline.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/proc-somewhat-simpler-code-for-proc-cmdline.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Subject: proc: somewhat simpler code for /proc/*/cmdline
"final" variable is OK but we can get away with less lines.
Link: http://lkml.kernel.org/r/20180221192751.GC28548@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/base.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff -puN fs/proc/base.c~proc-somewhat-simpler-code-for-proc-cmdline fs/proc/base.c
--- a/fs/proc/base.c~proc-somewhat-simpler-code-for-proc-cmdline
+++ a/fs/proc/base.c
@@ -334,8 +334,7 @@ static ssize_t proc_pid_cmdline_read(str
p = cmdline[i].p + pos1;
len = cmdline[i].len - pos1;
while (count > 0 && len > 0) {
- unsigned int nr_read, l;
- bool final;
+ unsigned int nr_read, nr_write;
nr_read = min3(count, len, PAGE_SIZE);
nr_read = access_remote_vm(mm, p, page, nr_read, 0);
@@ -346,25 +345,20 @@ static ssize_t proc_pid_cmdline_read(str
* Command line can be shorter than whole ARGV
* even if last "marker" byte says it is not.
*/
- final = false;
- l = strnlen(page, nr_read);
- if (l < nr_read) {
- nr_read = l;
- final = true;
- }
+ nr_write = strnlen(page, nr_read);
- if (copy_to_user(buf, page, nr_read)) {
+ if (copy_to_user(buf, page, nr_write)) {
rv = -EFAULT;
goto out_free_page;
}
- p += nr_read;
- len -= nr_read;
- buf += nr_read;
- count -= nr_read;
- rv += nr_read;
+ p += nr_write;
+ len -= nr_write;
+ buf += nr_write;
+ count -= nr_write;
+ rv += nr_write;
- if (final)
+ if (nr_write < nr_read)
goto out_free_page;
}
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
proc-revalidate-kernel-thread-inodes-to-root-root.patch
proc-fix-proc-loadavg-regression.patch
proc-make-proc-cmdline-go-through-lsm.patch
proc-more-unsigned-int-in-proc-cmdline.patch
proc-somewhat-simpler-code-for-proc-cmdline.patch
proc-simpler-iterations-for-proc-cmdline.patch
proc-deduplicate-proc-cmdline-implementation.patch
coredump-fix-spam-with-zero-vma-process.patch
seq_file-delete-small-value-optimization.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
