Skip to contentSkip to conversation

fcntl: don't cap l_start and l_end values for F_GETLK64 in compat syscall

PATCH In review Jeff Layton 3 participants 4 messages Nov 15, 2017 – Nov 17, 2017

Subsystems (9)
x86 VFS PowerPC MIPS +5 more subsystems
lore
Share & tools
lore

Jeff Layton

author maintainer
#0 lore raw

PATCH v2 1/1 fcntl: don't cap l_start and l_end values for F_GETLK64 in compat syscall

From: Jeff Layton <[email protected]>

Currently, we're capping the values too low in the F_GETLK64 case. The fields in that structure are 64-bit values, so we shouldn't need to do any sort of fixup there.

Make sure we check that assumption at build time in the future however by ensuring that the sizes we're copying will fit.

With this, we no longer need COMPAT_OFF_T_MAX either, so remove it.

Fixes 94073ad77fff2 (fs/locks: don't mess with the address limit in compat_fcntl64)
Reported-by Vitaly Lipatov <[email protected]>
Signed-off-by Jeff Layton <[email protected]>
---
 arch/arm64/include/asm/compat.h   |  1 -
 arch/mips/include/asm/compat.h    |  1 -
 arch/parisc/include/asm/compat.h  |  1 -
 arch/powerpc/include/asm/compat.h |  1 -
 arch/s390/include/asm/compat.h    |  1 -
 arch/sparc/include/asm/compat.h   |  1 -
 arch/tile/include/asm/compat.h    |  1 -
 arch/x86/include/asm/compat.h     |  1 -
 fs/fcntl.c                        | 11 +++++------
 9 files changed, 5 insertions(+), 14 deletions(-)
arch/arm64/include/asm/compat.h +0 -1
index e39d487bf724..a3c7f271ad4c 100644
@@ -215,7 +215,6 @@ typedef struct compat_siginfo {
 } compat_siginfo_t;
 
 #define COMPAT_OFF_T_MAX	0x7fffffff
-#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
 
 /*
  * A pointer passed in from user mode. This should not
arch/mips/include/asm/compat.h +0 -1
index 8e2b5b556488..49691331ada4 100644
@@ -200,7 +200,6 @@ typedef struct compat_siginfo {
 } compat_siginfo_t;
 
 #define COMPAT_OFF_T_MAX	0x7fffffff
-#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
 
 /*
  * A pointer passed in from user mode. This should not
arch/parisc/include/asm/compat.h +0 -1
index 07f48827afda..acf8aa07cbe0 100644
@@ -195,7 +195,6 @@ typedef struct compat_siginfo {
 } compat_siginfo_t;
 
 #define COMPAT_OFF_T_MAX	0x7fffffff
-#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
 
 struct compat_ipc64_perm {
 	compat_key_t key;
arch/powerpc/include/asm/compat.h +0 -1
index a035b1e5dfa7..8a2aecfe9b02 100644
@@ -185,7 +185,6 @@ typedef struct compat_siginfo {
 } compat_siginfo_t;
 
 #define COMPAT_OFF_T_MAX	0x7fffffff
-#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
 
 /*
  * A pointer passed in from user mode. This should not
arch/s390/include/asm/compat.h +0 -1
index 1b60eb3676d5..5e6a63641a5f 100644
@@ -263,7 +263,6 @@ typedef struct compat_siginfo {
 #define si_overrun	_sifields._timer._overrun
 
 #define COMPAT_OFF_T_MAX	0x7fffffff
-#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
 
 /*
  * A pointer passed in from user mode. This should not
arch/sparc/include/asm/compat.h +0 -1
index 977c3f280ba1..fa38c78de0f0 100644
@@ -209,7 +209,6 @@ typedef struct compat_siginfo {
 } compat_siginfo_t;
 
 #define COMPAT_OFF_T_MAX	0x7fffffff
-#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
 
 /*
  * A pointer passed in from user mode. This should not
arch/tile/include/asm/compat.h +0 -1
index c14e36f008c8..62a7b83025dd 100644
@@ -173,7 +173,6 @@ typedef struct compat_siginfo {
 } compat_siginfo_t;
 
 #define COMPAT_OFF_T_MAX	0x7fffffff
-#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
 
 struct compat_ipc64_perm {
 	compat_key_t key;
arch/x86/include/asm/compat.h +0 -1
index a600a6cda9ec..2cbd75dd2fd3 100644
@@ -210,7 +210,6 @@ typedef struct compat_siginfo {
 } compat_siginfo_t;
 
 #define COMPAT_OFF_T_MAX	0x7fffffff
-#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
 
 struct compat_ipc64_perm {
 	compat_key_t key;
fs/fcntl.c +5 -6
index e15bcc4265d0..0522e283a4f4 100644
@@ -563,6 +563,9 @@ static int put_compat_flock64(const struct flock *kfl, struct compat_flock64 __u
 {
 	struct compat_flock64 fl;
 
+	BUILD_BUG_ON(sizeof(kfl->l_start) > sizeof(ufl->l_start));
+	BUILD_BUG_ON(sizeof(kfl->l_len) > sizeof(ufl->l_len));
+
 	memset(&fl, 0, sizeof(struct compat_flock64));
 	copy_flock_fields(&fl, kfl);
 	if (copy_to_user(ufl, &fl, sizeof(struct compat_flock64)))

@@ -641,12 +644,8 @@ COMPAT_SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd,
 		if (err)
 			break;
 		err = fcntl_getlk(f.file, convert_fcntl_cmd(cmd), &flock);
-		if (err)
-			break;
-		err = fixup_compat_flock(&flock);
-		if (err)
-			return err;
-		err = put_compat_flock64(&flock, compat_ptr(arg));
+		if (!err)
+			err = put_compat_flock64(&flock, compat_ptr(arg));
 		break;
 	case F_SETLK:
 	case F_SETLKW:
Signature · 1 line
2.14.3
#1 lore raw

Jeff Layton писал 15.11.17 21:03:
...

Quoted 1 line

With this, we no longer need COMPAT_OFF_T_MAX either, so remove it.

COMPAT_LOFF_T_MAX

Signature · 3 lines
С уважением,
Виталий Липатов,
Etersoft
author maintainer
#2 lore raw
Quoted 6 lines · Vitaly Lipatov

Jeff Layton писал 15.11.17 21:03:
...

Quoted 1 line

With this, we no longer need COMPAT_OFF_T_MAX either, so remove it.

COMPAT_LOFF_T_MAX

Thanks, fixed in tree, but I won't resend just for that.

Are you able to test this patch and confirm that it fixes the problem you were seeing?

Thanks,

Signature · 1 line
Jeff Layton <[email protected]>
Reviewed-by on v2 1/1
#3 lore raw
In reply to Jeff Layton
Quoted 10 lines · Jeff Layton

From: Jeff Layton <[email protected]>

Currently, we're capping the values too low in the F_GETLK64 case. The fields in that structure are 64-bit values, so we shouldn't need to do any sort of fixup there.

Make sure we check that assumption at build time in the future however by ensuring that the sizes we're copying will fit.

With this, we no longer need COMPAT_OFF_T_MAX either, so remove it.

Sounds like the COMPAT_LOFF_T_MAX should be a separate patch, but otherwise this looks good.

Reviewed-by Christoph Hellwig <[email protected]>

Btw, I seems like arm has another copy of the old broken compat code in arch/arm/kernel/sys_oabi-compat.c. I wonder if anyone with a vested interest in arm would be willing to clean that mess up.