Skip to content

Commit

Permalink
swapfile: avoid NULL pointer dereference in swapon when s_bdev is NULL
Browse files Browse the repository at this point in the history
While testing Swap over NFS patchset, I noticed an oops that was triggered
during swapon. Investigating further, the NULL pointer deference is due to the
SSD device check/optimization in the swapon code that assumes s_bdev could never
be NULL.

inode->i_sb->s_bdev could be NULL in a few cases. For e.g. one such case is
loopback NFS mount, there could be others as well. Fix this by ensuring s_bdev
is not NULL before we try to deference s_bdev.

Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
  • Loading branch information
Suresh Jayaraman authored and Jens Axboe committed Oct 1, 2009
1 parent a112a71 commit 3bd0f0c
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions mm/swapfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -1974,12 +1974,14 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
goto bad_swap;
}

if (blk_queue_nonrot(bdev_get_queue(p->bdev))) {
p->flags |= SWP_SOLIDSTATE;
p->cluster_next = 1 + (random32() % p->highest_bit);
if (p->bdev) {
if (blk_queue_nonrot(bdev_get_queue(p->bdev))) {
p->flags |= SWP_SOLIDSTATE;
p->cluster_next = 1 + (random32() % p->highest_bit);
}
if (discard_swap(p) == 0)
p->flags |= SWP_DISCARDABLE;
}
if (discard_swap(p) == 0)
p->flags |= SWP_DISCARDABLE;

mutex_lock(&swapon_mutex);
spin_lock(&swap_lock);
Expand Down

0 comments on commit 3bd0f0c

Please sign in to comment.