From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 22 May 2014 00:44:11 +0000 (+1000)
Subject: sysctl-allow-for-strict-write-position-handling-fix
X-Git-Tag: next-20140530~2^2~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2ae7bf769cd1534c0466fd82f78ad7c9f10f3b5a;p=karo-tx-linux.git

sysctl-allow-for-strict-write-position-handling-fix

move misplaced hunk, per Randy

Cc: Kees Cook <keescook@chromium.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index e23d7017b870..51bbf904d694 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1783,8 +1783,8 @@ static int _proc_do_string(char *data, int maxlen, int write,
 
 static void warn_sysctl_write(struct ctl_table *table)
 {
-	pr_warn("%s wrote to %s when file position was not 0!\n",
-		current->comm, table->procname);
+	pr_warn("write to %s by %s used a non-zero file position!\n",
+		table->procname, current->comm);
 	pr_warn("This will not be supported in the future.\n");
 	pr_warn("To silence warning, set kernel.sysctl_writes_strict = -1\n");
 }