From: NeilBrown Finally got some testing done on this, and it wasn't quite right. We need to return information from F_GETLK no-matter what l_type is - at the very least we return a value in l_type, but might return start/length as well. This patch has been tested (LSB test suite), and works. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- fs/compat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff -puN fs/compat.c~fix-overflow-tests-for-compat_sys_fcntl64-locking-re-fix fs/compat.c --- devel/fs/compat.c~fix-overflow-tests-for-compat_sys_fcntl64-locking-re-fix 2005-11-22 22:30:47.000000000 -0800 +++ devel-akpm/fs/compat.c 2005-11-22 22:30:47.000000000 -0800 @@ -493,9 +493,9 @@ asmlinkage long compat_sys_fcntl64(unsig set_fs(KERNEL_DS); ret = sys_fcntl(fd, cmd, (unsigned long)&f); set_fs(old_fs); - if (cmd == F_GETLK && ret == 0 && f.l_type == F_UNLCK) { - /* there was a conflicting lock, and we need to return - * the data... but it needs to fit in the compat structure. + if (cmd == F_GETLK && ret == 0) { + /* GETLK was successfule and we need to return the data... + * but it needs to fit in the compat structure. * l_start shouldn't be too big, unless the original * start + end is greater than COMPAT_OFF_T_MAX, in which * case the app was asking for trouble, so we return @@ -526,7 +526,7 @@ asmlinkage long compat_sys_fcntl64(unsig ((cmd == F_SETLK64) ? F_SETLK : F_SETLKW), (unsigned long)&f); set_fs(old_fs); - if (cmd == F_GETLK64 && ret == 0 && f.l_type == F_UNLCK) { + if (cmd == F_GETLK64 && ret == 0) { /* need to return lock information - see above for commentary */ if (f.l_start > COMPAT_LOFF_T_MAX) ret = -EOVERFLOW; _