locks: Fix UBSAN undefined behaviour in flock64_to_posix_lock
Subsystems (2)
PATCH 1/1 locks: Fix UBSAN undefined behaviour in flock64_to_posix_lock
When the sum of fl->fl_start and l->l_len overflows, UBSAN shows the following warning:
UBSAN: Undefined behaviour in fs/locks.c:482:29 signed integer overflow: 2 + 9223372036854775806 cannot be represented in type 'long long int' Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xe4/0x14e lib/dump_stack.c:118 ubsan_epilogue+0xe/0x81 lib/ubsan.c:161 handle_overflow+0x193/0x1e2 lib/ubsan.c:192 flock64_to_posix_lock fs/locks.c:482 [inline] flock_to_posix_lock+0x595/0x690 fs/locks.c:515 fcntl_setlk+0xf3/0xa90 fs/locks.c:2262 do_fcntl+0x456/0xf60 fs/fcntl.c:387 __do_sys_fcntl fs/fcntl.c:483 [inline] __se_sys_fcntl fs/fcntl.c:468 [inline] __x64_sys_fcntl+0x12d/0x180 fs/fcntl.c:468 do_syscall_64+0xc8/0x5a0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x49/0xbe
Fix it by moving -1 forward.
--- fs/locks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/locks.c +1 -1
@@ -542,7 +542,7 @@ static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl,if (l->l_len >0 ) {if (l->l_len -1 >OFFSET_MAX - fl->fl_start)return -EOVERFLOW ; - fl->fl_end = fl->fl_start + l->l_len -1 ; + fl->fl_end = fl->fl_start -1 + l->l_len; }else if (l->l_len <0 ) {if (fl->fl_start + l->l_len <0 )
Signature · 1 line
2.25.4
Jeff Layton
maintainerQuoted 33 lines · Luo Meng
When the sum of
fl->fl_startandl->l_lenoverflows, UBSAN shows the following warning:UBSAN: Undefined behaviour in fs/locks.c:482:29 signed integer overflow: 2 + 9223372036854775806 cannot be represented in type 'long long int' Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xe4/0x14e lib/dump_stack.c:118 ubsan_epilogue+0xe/0x81 lib/ubsan.c:161 handle_overflow+0x193/0x1e2 lib/ubsan.c:192 flock64_to_posix_lock fs/locks.c:482 [inline] flock_to_posix_lock+0x595/0x690 fs/locks.c:515 fcntl_setlk+0xf3/0xa90 fs/locks.c:2262 do_fcntl+0x456/0xf60 fs/fcntl.c:387 __do_sys_fcntl fs/fcntl.c:483 [inline] __se_sys_fcntl fs/fcntl.c:468 [inline] __x64_sys_fcntl+0x12d/0x180 fs/fcntl.c:468 do_syscall_64+0xc8/0x5a0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x49/0xbeFix it by moving -1 forward.
Signed-off-by Luo Meng <[email protected]>--- fs/locks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/locks.c +0
-0
fs/locks.c static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl, · line 548
Quoted 8 lines
fs/locks.c +1
-1@@ -542,7 +542,7 @@ static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl,if (l->l_len >0 ) {if (l->l_len -1 >OFFSET_MAX - fl->fl_start)return -EOVERFLOW ; - fl->fl_end = fl->fl_start + l->l_len -1 ; + fl->fl_end = fl->fl_start -1 + l->l_len; }else if (l->l_len <0 ) {if (fl->fl_start + l->l_len <0 )
Wow, ok. Interesting that the order would have such an effect here, but it seems legit. I'll plan to merge this for v5.11. Let me know if we need to get this in earlier.
Thanks!
Signature · 1 line
Jeff Layton <[email protected]>
Quoted 40 lines · Jeff Layton
Quoted 39 lines · Luo Meng
When the sum of
fl->fl_startandl->l_lenoverflows, UBSAN shows the following warning:UBSAN: Undefined behaviour in fs/locks.c:482:29 signed integer overflow: 2 + 9223372036854775806 cannot be represented in type 'long long int' Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xe4/0x14e lib/dump_stack.c:118 ubsan_epilogue+0xe/0x81 lib/ubsan.c:161 handle_overflow+0x193/0x1e2 lib/ubsan.c:192 flock64_to_posix_lock fs/locks.c:482 [inline] flock_to_posix_lock+0x595/0x690 fs/locks.c:515 fcntl_setlk+0xf3/0xa90 fs/locks.c:2262 do_fcntl+0x456/0xf60 fs/fcntl.c:387 __do_sys_fcntl fs/fcntl.c:483 [inline] __se_sys_fcntl fs/fcntl.c:468 [inline] __x64_sys_fcntl+0x12d/0x180 fs/fcntl.c:468 do_syscall_64+0xc8/0x5a0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x49/0xbeFix it by moving -1 forward.
Signed-off-by Luo Meng <[email protected]>--- fs/locks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/locks.c +1
-1@@ -542,7 +542,7 @@ static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl,if (l->l_len >0 ) {if (l->l_len -1 >OFFSET_MAX - fl->fl_start)return -EOVERFLOW ; - fl->fl_end = fl->fl_start + l->l_len -1 ; + fl->fl_end = fl->fl_start -1 + l->l_len;
Quoted 6 lines
fs/locks.c static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl, · line 548
Quoted 2 lines
fs/locks.c +0
-0}else if (l->l_len <0 ) {if (fl->fl_start + l->l_len <0 )Wow, ok. Interesting that the order would have such an effect here, but it seems legit. I'll plan to merge this for v5.11. Let me know if we need to get this in earlier.
It's the kind of pedantic correctness thing that should be merged because C doesn't exactly define the behaviour. eg a sign-magnitude machine will behave differently from a twos-complement machine. The fact that nobody's made a sign-magnitude integer arithmetic machine in the last 60 years does not matter to the C spec.
It's a shame there's no uoff_t since it would be defined.
Quoted 33 lines · Luo Meng
When the sum of
fl->fl_startandl->l_lenoverflows, UBSAN shows the following warning:UBSAN: Undefined behaviour in fs/locks.c:482:29 signed integer overflow: 2 + 9223372036854775806 cannot be represented in type 'long long int' Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xe4/0x14e lib/dump_stack.c:118 ubsan_epilogue+0xe/0x81 lib/ubsan.c:161 handle_overflow+0x193/0x1e2 lib/ubsan.c:192 flock64_to_posix_lock fs/locks.c:482 [inline] flock_to_posix_lock+0x595/0x690 fs/locks.c:515 fcntl_setlk+0xf3/0xa90 fs/locks.c:2262 do_fcntl+0x456/0xf60 fs/fcntl.c:387 __do_sys_fcntl fs/fcntl.c:483 [inline] __se_sys_fcntl fs/fcntl.c:468 [inline] __x64_sys_fcntl+0x12d/0x180 fs/fcntl.c:468 do_syscall_64+0xc8/0x5a0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x49/0xbeFix it by moving -1 forward.
Signed-off-by Luo Meng <[email protected]>--- fs/locks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/locks.c +0
-0
fs/locks.c static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl, · line 546
Quoted 6 lines
fs/locks.c +1
-1@@ -542,7 +542,7 @@ static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl,if (l->l_len >0 ) {if (l->l_len -1 >OFFSET_MAX - fl->fl_start)return -EOVERFLOW ; - fl->fl_end = fl->fl_start + l->l_len -1 ; + fl->fl_end = fl->fl_start -1 + l->l_len;
Given what the bounds check just above does, wouldn't it make more sense to parenthesize 'l->l_len - 1' instead? So:
fl->fl_end = fl->fl_start + (l->l_len - 1);
Also FWIW, the Linux kernel uses the -fwrapv compiler flag, so signed integer overflow is defined. IMO it's still best avoided though...
- Eric
Jeff Layton
maintainerQuoted 44 lines · Eric Biggers
Quoted 33 lines · Luo Meng
When the sum of
fl->fl_startandl->l_lenoverflows, UBSAN shows the following warning:UBSAN: Undefined behaviour in fs/locks.c:482:29 signed integer overflow: 2 + 9223372036854775806 cannot be represented in type 'long long int' Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xe4/0x14e lib/dump_stack.c:118 ubsan_epilogue+0xe/0x81 lib/ubsan.c:161 handle_overflow+0x193/0x1e2 lib/ubsan.c:192 flock64_to_posix_lock fs/locks.c:482 [inline] flock_to_posix_lock+0x595/0x690 fs/locks.c:515 fcntl_setlk+0xf3/0xa90 fs/locks.c:2262 do_fcntl+0x456/0xf60 fs/fcntl.c:387 __do_sys_fcntl fs/fcntl.c:483 [inline] __se_sys_fcntl fs/fcntl.c:468 [inline] __x64_sys_fcntl+0x12d/0x180 fs/fcntl.c:468 do_syscall_64+0xc8/0x5a0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x49/0xbeFix it by moving -1 forward.
Signed-off-by Luo Meng <[email protected]>--- fs/locks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/locks.c +0
-0fs/locks.c static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl, · line 546
Quoted 6 lines
fs/locks.c +1
-1@@ -542,7 +542,7 @@ static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl,if (l->l_len >0 ) {if (l->l_len -1 >OFFSET_MAX - fl->fl_start)return -EOVERFLOW ; - fl->fl_end = fl->fl_start + l->l_len -1 ; + fl->fl_end = fl->fl_start -1 + l->l_len;Given what the bounds check just above does, wouldn't it make more sense to parenthesize '
l->l_len- 1' instead? So:
Quoted 5 lines
fl->fl_end = fl->fl_start + (l->l_len - 1);Also FWIW, the Linux kernel uses the -fwrapv compiler flag, so signed integer overflow is defined. IMO it's still best avoided though...
That does seem less ambiguous.
Luo, if you're OK with that approach, I can just fix it up in-tree.
Signature · 1 line
Jeff Layton <[email protected]>