Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8d657eb3b43861064d36241e88d9d61c709f33f0

Authored by Dave Jones
Committed by Linus Torvalds
1 parent 39ea32ca7e
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Remove easily user-triggerable BUG from generic_setlease 

This can be trivially triggered from userspace by passing in something unexpected.

    kernel BUG at fs/locks.c:1468!
    invalid opcode: 0000 [#1] SMP
    RIP: 0010:generic_setlease+0xc2/0x100
    Call Trace:
      __vfs_setlease+0x35/0x40
      fcntl_setlease+0x76/0x150
      sys_fcntl+0x1c6/0x810
      system_call_fastpath+0x1a/0x1f

Signed-off-by: Dave Jones <davej@redhat.com>
Cc: stable@kernel.org # 3.2+
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -1465,7 +1465,7 @@
1465 1465 case F_WRLCK:
1466 1466 return generic_add_lease(filp, arg, flp);
1467 1467 default:
1468   - BUG();
  1468 + return -EINVAL;
1469 1469 }
1470 1470 }
1471 1471 EXPORT_SYMBOL(generic_setlease);