Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4a6e617a4bec9fb2ee4a16cf59565b2af5049e12

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent e0980dafa3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

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

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Dave Kleikamp <shaggy@austin.ibm.com>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 6 changed files with 11 additions and 11 deletions Side-by-side Diff

... ... @@ -36,7 +36,7 @@
36 36 va_list args;
37 37  
38 38 va_start(args, fmt);
39   - vsprintf(error_buf, fmt, args);
  39 + vsnprintf(error_buf, sizeof(error_buf), fmt, args);
40 40 va_end(args);
41 41  
42 42 printk(KERN_CRIT "ADFS-fs error (device %s)%s%s: %s\n",
... ... @@ -445,7 +445,7 @@
445 445 va_list args;
446 446  
447 447 va_start(args,fmt);
448   - vsprintf(ErrorBuffer,fmt,args);
  448 + vsnprintf(ErrorBuffer,sizeof(ErrorBuffer),fmt,args);
449 449 va_end(args);
450 450  
451 451 printk(KERN_CRIT "AFFS error (device %s): %s(): %s\n", sb->s_id,
... ... @@ -461,7 +461,7 @@
461 461 va_list args;
462 462  
463 463 va_start(args,fmt);
464   - vsprintf(ErrorBuffer,fmt,args);
  464 + vsnprintf(ErrorBuffer,sizeof(ErrorBuffer),fmt,args);
465 465 va_end(args);
466 466  
467 467 printk(KERN_WARNING "AFFS warning (device %s): %s(): %s\n", sb->s_id,
... ... @@ -93,7 +93,7 @@
93 93 va_list args;
94 94  
95 95 va_start(args, function);
96   - vsprintf(error_buf, function, args);
  96 + vsnprintf(error_buf, sizeof(error_buf), function, args);
97 97 va_end(args);
98 98  
99 99 printk(KERN_ERR "ERROR: (device %s): %s\n", sb->s_id, error_buf);
... ... @@ -1674,7 +1674,7 @@
1674 1674 va_list args;
1675 1675  
1676 1676 va_start(args, fmt);
1677   - vsprintf(error_buf, fmt, args);
  1677 + vsnprintf(error_buf, sizeof(error_buf), fmt, args);
1678 1678 va_end(args);
1679 1679  
1680 1680 /* Not using mlog here because we want to show the actual
... ... @@ -1695,7 +1695,7 @@
1695 1695 va_list args;
1696 1696  
1697 1697 va_start(args, fmt);
1698   - vsprintf(error_buf, fmt, args);
  1698 + vsnprintf(error_buf, sizeof(error_buf), fmt, args);
1699 1699 va_end(args);
1700 1700  
1701 1701 printk(KERN_CRIT "OCFS2: abort (device %s): %s: %s\n",
... ... @@ -1709,7 +1709,7 @@
1709 1709 sb->s_dirt = 1;
1710 1710 }
1711 1711 va_start(args, fmt);
1712   - vsprintf(error_buf, fmt, args);
  1712 + vsnprintf(error_buf, sizeof(error_buf), fmt, args);
1713 1713 va_end(args);
1714 1714 printk (KERN_CRIT "UDF-fs error (device %s): %s: %s\n",
1715 1715 sb->s_id, function, error_buf);
... ... @@ -1721,7 +1721,7 @@
1721 1721 va_list args;
1722 1722  
1723 1723 va_start (args, fmt);
1724   - vsprintf(error_buf, fmt, args);
  1724 + vsnprintf(error_buf, sizeof(error_buf), fmt, args);
1725 1725 va_end(args);
1726 1726 printk(KERN_WARNING "UDF-fs warning (device %s): %s: %s\n",
1727 1727 sb->s_id, function, error_buf);
... ... @@ -224,7 +224,7 @@
224 224 sb->s_flags |= MS_RDONLY;
225 225 }
226 226 va_start (args, fmt);
227   - vsprintf (error_buf, fmt, args);
  227 + vsnprintf (error_buf, sizeof(error_buf), fmt, args);
228 228 va_end (args);
229 229 switch (UFS_SB(sb)->s_mount_opt & UFS_MOUNT_ONERROR) {
230 230 case UFS_MOUNT_ONERROR_PANIC:
... ... @@ -255,7 +255,7 @@
255 255 sb->s_dirt = 1;
256 256 }
257 257 va_start (args, fmt);
258   - vsprintf (error_buf, fmt, args);
  258 + vsnprintf (error_buf, sizeof(error_buf), fmt, args);
259 259 va_end (args);
260 260 sb->s_flags |= MS_RDONLY;
261 261 printk (KERN_CRIT "UFS-fs panic (device %s): %s: %s\n",
... ... @@ -268,7 +268,7 @@
268 268 va_list args;
269 269  
270 270 va_start (args, fmt);
271   - vsprintf (error_buf, fmt, args);
  271 + vsnprintf (error_buf, sizeof(error_buf), fmt, args);
272 272 va_end (args);
273 273 printk (KERN_WARNING "UFS-fs warning (device %s): %s: %s\n",
274 274 sb->s_id, function, error_buf);