Skip to content

Commit

Permalink
Fix NULL deref in balance_pgdat()
Browse files Browse the repository at this point in the history
Be careful not to unconditionally clear the PF_MEMALLOC bit in
the task structure.  It may have already been set when entering
zpl_putpage() in which case it must remain set on exit.  In
particular the kswapd thread will have PF_MEMALLOC set in
order to prevent it from entering direct reclaim.  By clearing
it we allow the following NULL deref to potentially occur.

  BUG: unable to handle kernel NULL pointer dereference at (null)
  IP: [<ffffffff8109c7ab>] balance_pgdat+0x25b/0x4ff

Signed-off-by: Brian Behlendorf <[email protected]>
Issue openzfs#287
  • Loading branch information
behlendorf committed Nov 1, 2011
1 parent c475167 commit 80c97dd
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions module/zfs/zpl_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,13 @@ zpl_putpage(struct page *pp, struct writeback_control *wbc, void *data)
* the VM might try to write out additional pages by calling
* zpl_putpage() again resulting in a deadlock.
*/
current->flags |= PF_MEMALLOC;
(void) zfs_putpage(mapping->host, pp, wbc);
current->flags &= ~PF_MEMALLOC;
if (current->flags & PF_MEMALLOC) {
(void) zfs_putpage(mapping->host, pp, wbc);
} else {
current->flags |= PF_MEMALLOC;
(void) zfs_putpage(mapping->host, pp, wbc);
current->flags &= ~PF_MEMALLOC;
}

return (0);
}
Expand Down

0 comments on commit 80c97dd

Please sign in to comment.