summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorHerbert Poetzl <herbert@13thfloor.at>2006-12-08 02:36:00 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 08:28:37 -0800
commita2ee8649ba6d71416712e798276bf7c40b64e6e5 (patch)
tree90603c28d717fc0b2e92adb7e3f3a98adf6ae458 /fs
parent6e2ac66470976ad7f57e0948572669b2bdfea2d0 (diff)
downloadlinux-3.10-a2ee8649ba6d71416712e798276bf7c40b64e6e5.tar.gz
linux-3.10-a2ee8649ba6d71416712e798276bf7c40b64e6e5.tar.bz2
linux-3.10-a2ee8649ba6d71416712e798276bf7c40b64e6e5.zip
[PATCH] Fix linux banner utsname information
utsname information is shown in the linux banner, which also is used for /proc/version (which can have different utsname values inside a uts namespaces). this patch makes the varying data arguments and changes the string to a format string, using those arguments. Signed-off-by: Herbert Poetzl <herbert@13thfloor.at> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/proc_misc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 51815cece6f..9397ff62553 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -252,8 +252,8 @@ static int version_read_proc(char *page, char **start, off_t off,
{
int len;
- strcpy(page, linux_banner);
- len = strlen(page);
+ len = sprintf(page, linux_banner,
+ utsname()->release, utsname()->version);
return proc_calc_metrics(page, start, off, count, eof, len);
}