sysctl: add KERN_CONT to deprecated_sysctl_warning()

Tetsuo Handa · torvalds · commit 7560ef39dc0b · 2016-12-14T16:04:07.000-08:00
Do not break lines while printk()ing values. kernel: warning: process `tomoyo_file_tes' used the deprecated sysctl system call with kernel: 3. kernel: 5. kernel: 56. kernel: Link: http://lkml.kernel.org/r/1480814833-4976-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
@@ -1354,8 +1354,8 @@ static void deprecated_sysctl_warning(const int *name, int nlen)
 			"warning: process `%s' used the deprecated sysctl "
 			"system call with ", current->comm);
 		for (i = 0; i < nlen; i++)
-			printk("%d.", name[i]);
-		printk("\n");
+			printk(KERN_CONT "%d.", name[i]);
+		printk(KERN_CONT "\n");
 	}
 	return;
 }

Original file line number	Diff line number	Diff line change
`@@ -1354,8 +1354,8 @@ static void deprecated_sysctl_warning(const int *name, int nlen)`
`1354`	`1354`	"warning: process `%s' used the deprecated sysctl "
`1355`	`1355`	`"system call with ", current->comm);`
`1356`	`1356`	`for (i = 0; i < nlen; i++)`
`1357`		`- printk("%d.", name[i]);`
`1358`		`- printk("\n");`
	`1357`	`+ printk(KERN_CONT "%d.", name[i]);`
	`1358`	`+ printk(KERN_CONT "\n");`
`1359`	`1359`	`}`
`1360`	`1360`	`return;`
`1361`	`1361`	`}`