[LV-kern-commit] kernel-2.4/fs/proc array.c,1.4,1.5

[<ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/fs/proc
In directory sc8-pr-cvs1:/tmp/cvs-serv26117/fs/proc

Modified Files:
	array.c 
Log Message:
Merge 2.4.21 - build fixes

Index: array.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/proc/array.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- array.c	21 Sep 2003 13:12:31 -0000	1.4
+++ array.c	27 Sep 2003 09:21:19 -0000	1.5
@@ -567,6 +567,8 @@
 		line = d_path(map->vm_file->f_dentry,
 			      map->vm_file->f_vfsmnt,
 			      buf, PAGE_SIZE);
+		if (IS_ERR(line))
+			return PTR_ERR(line);
 		buf[PAGE_SIZE-1] = '\n';
 		line -= MAPS_LINE_MAX;
 		if(line < buf)
@@ -640,6 +642,8 @@
 			goto next;
 		}
 		len = proc_pid_maps_get_line(tmp, map);
+		if (len < 0)
+			goto out_unlock;
 		len -= off;
 		if (len > 0) {
 			if (retval+len > count) {
@@ -661,6 +665,8 @@
 		if (loff) BUG();
 		map = map->vm_next;
 	}
+
+out_unlock:
 	up_read(&mm->mmap_sem);
 	mmput(mm);