2004-11-11 16:26:06

by Kirill Korotaev

[permalink] [raw]
Subject: [PATCH]: 4/4GB: Incorrect bound check in do_getname()

--- linux-2.6.8.1.test/fs/namei.c.tasksize 2003-08-28 21:38:41.000000000 +0400
+++ linux-2.6.8.1.test/fs/namei.c 2003-09-11 16:02:04.000000000 +0400
@@ -106,11 +106,12 @@
int retval;
unsigned long len = PATH_MAX;

- if ((unsigned long) filename >= TASK_SIZE) {
- if (!segment_eq(get_fs(), KERNEL_DS))
+ if (!segment_eq(get_fs(), KERNEL_DS)) {
+ if ((unsigned long) filename >= TASK_SIZE)
return -EFAULT;
- } else if (TASK_SIZE - (unsigned long) filename < PATH_MAX)
- len = TASK_SIZE - (unsigned long) filename;
+ if (TASK_SIZE - (unsigned long) filename < PATH_MAX)
+ len = TASK_SIZE - (unsigned long) filename;
+ }

retval = strncpy_from_user((char *)page, filename, len);
if (retval > 0) {


Attachments:
diff-arch-4gb-getname (713.00 B)