[PATCH] check d_path() error in print-fatal-signals

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



d_path() returns -ENAMETOOLONG if buffer length is not enough.
But there is no error handling for it in print_vma() which calls
d_path() with not enough buffer (We can easily make segfault program
which has longer path than 128bytes).

This patch allocates enough buffer for d_path() dynamically.
audit_log_d_path() is doing sililar thing. So I just stole from it.

Signed-off-by: Akinobu Mita <[email protected]>

---
 kernel/signal.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Index: 2.6-mm/kernel/signal.c
===================================================================
--- 2.6-mm.orig/kernel/signal.c
+++ 2.6-mm/kernel/signal.c
@@ -740,15 +740,23 @@ static int print_vma(struct vm_area_stru
 	 * special [heap] marker for the heap:
 	 */
 	if (file) {
-#define SIZE 128
-		char tmp[SIZE], *str;
-
-		str = d_path(file->f_dentry, file->f_vfsmnt, tmp, SIZE);
-		while (str[0] && (str[0] == ' '))
-			str++;
+		char *p, *path;
 
+		/* We will allow 11 spaces for ' (deleted)' to be appended */
+		path = kmalloc(PATH_MAX + 11, GFP_KERNEL);
+		if (!path)
+			p = "<no memory>";
+		else {
+			p = d_path(file->f_dentry, file->f_vfsmnt, path,
+				   PATH_MAX + 11);
+			if (IS_ERR(p))
+				p = "<too long>";
+			else
+				p = strstrip(p);
+		}
 		pad_len_spaces(len);
-		printk("%s", str);
+		printk("%s", p);
+		kfree(path);
 	} else {
 		const char *name = arch_vma_name(vma);
 		if (!name) {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux