Prechádzať zdrojové kódy

kernel/sysctl_binary.c: use scnprintf() instead of snprintf()

snprintf() will return the 'ideal' length which may be larger than real
buffer length, if we only want to use real length, need use scnprintf()
instead of.

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Chen Gang 12 rokov pred
rodič
commit
f02147ef19
1 zmenil súbory, kde vykonal 3 pridanie a 3 odobranie
  1. 3 3
      kernel/sysctl_binary.c

+ 3 - 3
kernel/sysctl_binary.c

@@ -1024,7 +1024,7 @@ static ssize_t bin_intvec(struct file *file,
 			if (get_user(value, vec + i))
 			if (get_user(value, vec + i))
 				goto out_kfree;
 				goto out_kfree;
 
 
-			str += snprintf(str, end - str, "%lu\t", value);
+			str += scnprintf(str, end - str, "%lu\t", value);
 		}
 		}
 
 
 		result = kernel_write(file, buffer, str - buffer, 0);
 		result = kernel_write(file, buffer, str - buffer, 0);
@@ -1095,7 +1095,7 @@ static ssize_t bin_ulongvec(struct file *file,
 			if (get_user(value, vec + i))
 			if (get_user(value, vec + i))
 				goto out_kfree;
 				goto out_kfree;
 
 
-			str += snprintf(str, end - str, "%lu\t", value);
+			str += scnprintf(str, end - str, "%lu\t", value);
 		}
 		}
 
 
 		result = kernel_write(file, buffer, str - buffer, 0);
 		result = kernel_write(file, buffer, str - buffer, 0);
@@ -1205,7 +1205,7 @@ static ssize_t bin_dn_node_address(struct file *file,
 		if (get_user(dnaddr, (__le16 __user *)newval))
 		if (get_user(dnaddr, (__le16 __user *)newval))
 			goto out;
 			goto out;
 
 
-		len = snprintf(buf, sizeof(buf), "%hu.%hu",
+		len = scnprintf(buf, sizeof(buf), "%hu.%hu",
 				le16_to_cpu(dnaddr) >> 10,
 				le16_to_cpu(dnaddr) >> 10,
 				le16_to_cpu(dnaddr) & 0x3ff);
 				le16_to_cpu(dnaddr) & 0x3ff);