ocfs2: fix null pointer dereference in ocfs2_dir_foreach_blk_id()
authorJeff Liu <[email protected]>
Tue, 13 Aug 2013 23:01:01 +0000 (16:01 -0700)
committerLinus Torvalds <[email protected]>
Wed, 14 Aug 2013 00:57:49 +0000 (17:57 -0700)
commitd6394b5900298385fd6fab299c445fb1b0b7a182
tree52c7cd17bc86308fa8c5bfb51d378da62193927c
parentdf54d6fa54275ce59660453e29d1228c2b45a826
ocfs2: fix null pointer dereference in ocfs2_dir_foreach_blk_id()

Fix a NULL pointer deference while removing an empty directory, which
was introduced by commit 3704412bdbf3 ("[readdir] convert ocfs2").

  BUG: unable to handle kernel NULL pointer dereference at (null)
  IP: [<(null)>]           (null)
  PGD 6da85067 PUD 6da89067 PMD 0
  Oops: 0010 [#1] SMP
  CPU: 0 PID: 6564 Comm: rmdir Tainted: G           O 3.11.0-rc1 #4
  RIP: 0010:[<0000000000000000>]  [<          (null)>]           (null)
  Call Trace:
    ocfs2_dir_foreach+0x49/0x50 [ocfs2]
    ocfs2_empty_dir+0x12c/0x3e0 [ocfs2]
    ocfs2_unlink+0x56e/0xc10 [ocfs2]
    vfs_rmdir+0xd5/0x140
    do_rmdir+0x1cb/0x1e0
    SyS_rmdir+0x16/0x20
    system_call_fastpath+0x16/0x1b
  Code:  Bad RIP value.
  RIP  [<          (null)>]           (null)
  RSP <ffff88006daddc10>
  CR2: 0000000000000000

[[email protected]: fix pointer math]
Signed-off-by: Jie Liu <[email protected]>
Reported-by: David Weber <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Joel Becker <[email protected]>
Cc: Mark Fasheh <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
fs/ocfs2/dir.c