Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a6e617a authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] fs/*: trivial vsnprintf() conversion 



It would very lame to get buffer overflow via one of the following.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Dave Kleikamp <shaggy@austin.ibm.com>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e0980daf

fs/adfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void __adfs_error(struct super_block *sb, const char *function, const char *fmt, 
	va_list args;



	va_start(args, fmt);

	vsprintf(error_buf, fmt, args);

	vsnprintf(error_buf, sizeof(error_buf), fmt, args);

	va_end(args);



	printk(KERN_CRIT "ADFS-fs error (device %s)%s%s: %s\n",

fs/affs/amigaffs.c

+2 −2
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ affs_error(struct super_block *sb, const char *function, const char *fmt, ...) 
	va_list	 args;



	va_start(args,fmt);

	vsprintf(ErrorBuffer,fmt,args);

	vsnprintf(ErrorBuffer,sizeof(ErrorBuffer),fmt,args);

	va_end(args);



	printk(KERN_CRIT "AFFS error (device %s): %s(): %s\n", sb->s_id,
@@ -461,7 +461,7 @@ affs_warning(struct super_block *sb, const char *function, const char *fmt, ...) 
	va_list	 args;



	va_start(args,fmt);

	vsprintf(ErrorBuffer,fmt,args);

	vsnprintf(ErrorBuffer,sizeof(ErrorBuffer),fmt,args);

	va_end(args);



	printk(KERN_WARNING "AFFS warning (device %s): %s(): %s\n", sb->s_id,

fs/jfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void jfs_error(struct super_block *sb, const char * function, ...) 
	va_list args;



	va_start(args, function);

	vsprintf(error_buf, function, args);

	vsnprintf(error_buf, sizeof(error_buf), function, args);

	va_end(args);



	printk(KERN_ERR "ERROR: (device %s): %s\n", sb->s_id, error_buf);

fs/ocfs2/super.c

+2 −2
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ void __ocfs2_error(struct super_block *sb, 
	va_list args;



	va_start(args, fmt);

	vsprintf(error_buf, fmt, args);

	vsnprintf(error_buf, sizeof(error_buf), fmt, args);

	va_end(args);



	/* Not using mlog here because we want to show the actual
@@ -1695,7 +1695,7 @@ void __ocfs2_abort(struct super_block* sb, 
	va_list args;



	va_start(args, fmt);

	vsprintf(error_buf, fmt, args);

	vsnprintf(error_buf, sizeof(error_buf), fmt, args);

	va_end(args);



	printk(KERN_CRIT "OCFS2: abort (device %s): %s: %s\n",

fs/udf/super.c

+2 −2
Original line number Diff line number Diff line
@@ -1709,7 +1709,7 @@ void udf_error(struct super_block *sb, const char *function, 
		sb->s_dirt = 1;

	}

	va_start(args, fmt);

	vsprintf(error_buf, fmt, args);

	vsnprintf(error_buf, sizeof(error_buf), fmt, args);

	va_end(args);

	printk (KERN_CRIT "UDF-fs error (device %s): %s: %s\n",

		sb->s_id, function, error_buf);
@@ -1721,7 +1721,7 @@ void udf_warning(struct super_block *sb, const char *function, 
	va_list args;



	va_start (args, fmt);

	vsprintf(error_buf, fmt, args);

	vsnprintf(error_buf, sizeof(error_buf), fmt, args);

	va_end(args);

	printk(KERN_WARNING "UDF-fs warning (device %s): %s: %s\n",

		sb->s_id, function, error_buf);