Skip to contentSkip to conversation

swapfile: avoid NULL pointer dereference in swapon when s_bdev is NULL

PATCH In review Suresh Jayaraman 3 participants 9 messages Sep 29, 2009 – Oct 21, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 swapfile: avoid NULL pointer dereference in swapon when s_bdev is NULL

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.

---
 mm/swapfile.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
mm/swapfile.c +7 -5
index 4de7f02..a1bc6b9 100644
@@ -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);
#1 lore raw
Quoted 28 lines · Suresh Jayaraman

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.

---
 mm/swapfile.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
mm/swapfile.c +3 -3
index 4de7f02..a1bc6b9 100644
@@ -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;

mm/swapfile.c SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) · line 1987

Quoted 10 lines
mm/swapfile.c +4 -2
+			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);

Thanks for the patch, looks correct.

Signature · 1 line
Jens Axboe
Acked-by on v1 1/1
#2 lore raw
In reply to Suresh Jayaraman
Quoted 10 lines · Suresh Jayaraman

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.

Thanks a lot for that: sorry to say I was ignorant of the possibility.

This is only an issue with an out-of-tree patch, is that correct? I'd like it to be fixed anyway, but if there's a way in which it can happen in unpatched 2.6.31, then we ought to send the fix to -stable.

I've added Rafael to the Cc, because CONFIG_HIBERNATION's swap_type_of() looks also dangerous in this respect - and especially where it does that "if (bdev == sis->bdev) {" match, I think it's assuming NULL bdev cannot match against anything.

Hugh

Quoted 28 lines
---
 mm/swapfile.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
mm/swapfile.c +7 -5
index 4de7f02..a1bc6b9 100644
@@ -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);
#3 lore raw
Quoted 11 lines · Hugh Dickins
Quoted 9 lines · Suresh Jayaraman

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.

Quoted 7 lines
Quoted 1 line

Thanks a lot for that: sorry to say I was ignorant of the possibility.

This is only an issue with an out-of-tree patch, is that correct?

Yes, it was reproducible only with an out-of-tree patch.

Quoted 7 lines

I'd like it to be fixed anyway, but if there's a way in which it can happen in unpatched 2.6.31, then we ought to send the fix to -stable.

I've added Rafael to the Cc, because CONFIG_HIBERNATION's swap_type_of() looks also dangerous in this respect - and especially where it does that "if (bdev == sis->bdev) {" match, I think it's assuming NULL bdev cannot match against anything.

Yeah, perhaps. I stumbled upon one more of such error - a NULL pointer dereference in blkdev_issue_discard() called from get_swap_page() when I ran memhog, a simple program to generate a memory hog with Swap over NFS patches.

The call sequence is add_to_swap() -> get_swap_page() -> scan_swap_map() -> discard_swap_cluster() -> blkdev_issue_discard().

Wrapping the code around a NULL check fixes the Oops for me.

---
 mm/swapfile.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
mm/swapfile.c +11 -7
index 4de7f02..51f39cf 100644
@@ -160,11 +160,13 @@ static int discard_swap(struct swap_info_struct *si)
 				continue;
 		}
 
-		err = blkdev_issue_discard(si->bdev, start_block,
-						nr_blocks, GFP_KERNEL,
-						DISCARD_FL_BARRIER);
-		if (err)
-			break;
+		if (si->bdev) {
+			err = blkdev_issue_discard(si->bdev, start_block,
+					nr_blocks, GFP_KERNEL,
+					DISCARD_FL_BARRIER);
+			if (err)
+				break;
+		}
 
 		cond_resched();
 	}
@@ -200,10 +202,12 @@ static void discard_swap_cluster(struct swap_info_struct *si,
 
 			start_block <<= PAGE_SHIFT - 9;
 			nr_blocks <<= PAGE_SHIFT - 9;
-			if (blkdev_issue_discard(si->bdev, start_block,
+			if (si->bdev) {
+				if (blkdev_issue_discard(si->bdev, start_block,
 							nr_blocks, GFP_NOIO,
 							DISCARD_FL_BARRIER))
-				break;
+					break;
+			}
 		}
 
 		lh = se->list.next;
#4 lore raw
Quoted 9 lines · Suresh Jayaraman

Yeah, perhaps. I stumbled upon one more of such error - a NULL pointer dereference in blkdev_issue_discard() called from get_swap_page() when I ran memhog, a simple program to generate a memory hog with Swap over NFS patches.

The call sequence is add_to_swap() -> get_swap_page() -> scan_swap_map() -> discard_swap_cluster() -> blkdev_issue_discard().

Wrapping the code around a NULL check fixes the Oops for me.

That's odd: scan_swap_map() should only discard_swap_cluster() if SWP_DISCARDABLE got set, and your first patch made sure that it wasn't.

So I don't think this second patch should be necessary: you did have your first applied when you found this?

I wonder if there's a funny little issue like si->lowest_alloc not being reset to 0 where it should be. Were you switching between NFS swap and SSD swap in your testing?

Hugh

#5 lore raw
Quoted 5 lines · Hugh Dickins
Quoted 4 lines · Suresh Jayaraman

Yeah, perhaps. I stumbled upon one more of such error - a NULL pointer dereference in blkdev_issue_discard() called from get_swap_page() when I ran memhog, a simple program to generate a memory hog with Swap over NFS patches.

Quoted 7 lines
Quoted 4 lines

The call sequence is add_to_swap() -> get_swap_page() -> scan_swap_map() -> discard_swap_cluster() -> blkdev_issue_discard().

Wrapping the code around a NULL check fixes the Oops for me.

That's odd: scan_swap_map() should only discard_swap_cluster() if SWP_DISCARDABLE got set, and your first patch made sure that it wasn't.

I forgot to mention, this is not on loopback NFS mount but an remote NFS mount (so possibly s_bdev is not NULL) when doing swapon. The oops was triggered when memhog program tries to use the swap space on the newly created swapfile on NFS. I have not completely investigated the issue, perhaps s_bdev is not being set when it ought to be..

Quoted 2 lines

So I don't think this second patch should be necessary: you did have your first applied when you found this?

yes, I had the first patch applied when it oopsed and I don't use SSD at all.

Quoted 3 lines

I wonder if there's a funny little issue like si->lowest_alloc not being reset to 0 where it should be. Were you switching between NFS swap and SSD swap in your testing?

No.

Thanks,

Signature · 1 line
Suresh Jayaraman
#6 lore raw
Quoted 8 lines · Suresh Jayaraman
Quoted 7 lines · Hugh Dickins
Quoted 5 lines · Suresh Jayaraman

The call sequence is add_to_swap() -> get_swap_page() -> scan_swap_map() -> discard_swap_cluster() -> blkdev_issue_discard().

Wrapping the code around a NULL check fixes the Oops for me.

Quoted 8 lines
Quoted 2 lines

That's odd: scan_swap_map() should only discard_swap_cluster() if SWP_DISCARDABLE got set, and your first patch made sure that it wasn't.

I forgot to mention, this is not on loopback NFS mount but an remote NFS mount (so possibly s_bdev is not NULL) when doing swapon. The oops was triggered when memhog program tries to use the swap space on the newly created swapfile on NFS. I have not completely investigated the issue, perhaps s_bdev is not being set when it ought to be..

I'm happy to see your first patch already in 2.6.32-rc3, but still suspicious of this second patch you sent afterwards. A quick skim through your patchset suggests 23/31 is probably responsible:

include/linux/swap.h +1 -0
@@ -120,6 +120,7 @@ struct swap_extent {
 enum {
 	SWP_USED	= (1 << 0),	/* is slot in swap_info[] used? */
 	SWP_WRITEOK	= (1 << 1),	/* ok to write to this swap?	*/
+	SWP_FILE	= (1 << 2),	/* file swap area */
 	SWP_DISCARDABLE = (1 << 2),	/* blkdev supports discard */
 	SWP_DISCARDING	= (1 << 3),	/* now discarding a free cluster */
 	SWP_SOLIDSTATE	= (1 << 4),	/* blkdev seeks are cheap */

Hugh

#7 lore raw
Quoted 15 lines · Hugh Dickins
Quoted 5 lines · Suresh Jayaraman
Quoted 4 lines · Hugh Dickins
Quoted 3 lines · Suresh Jayaraman

The call sequence is add_to_swap() -> get_swap_page() -> scan_swap_map() -> discard_swap_cluster() -> blkdev_issue_discard().

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

Wrapping the code around a NULL check fixes the Oops for me.

That's odd: scan_swap_map() should only discard_swap_cluster() if SWP_DISCARDABLE got set, and your first patch made sure that it wasn't.

I forgot to mention, this is not on loopback NFS mount but an remote NFS mount (so possibly s_bdev is not NULL) when doing swapon. The oops was triggered when memhog program tries to use the swap space on the newly created swapfile on NFS. I have not completely investigated the issue, perhaps s_bdev is not being set when it ought to be..

Quoted 3 lines

I'm happy to see your first patch already in 2.6.32-rc3, but still suspicious of this second patch you sent afterwards. A quick skim through your patchset suggests 23/31 is probably responsible:

Thanks for skimming through those patches. I noticed this already during my review and thought I had already fixed this, but apparently I missed out. I'll test after fixing this and report.

Quoted 11 lines
include/linux/swap.h +1 -0
@@ -120,6 +120,7 @@ struct swap_extent {
 enum {
 	SWP_USED	= (1 << 0),	/* is slot in swap_info[] used? */
 	SWP_WRITEOK	= (1 << 1),	/* ok to write to this swap?	*/
+	SWP_FILE	= (1 << 2),	/* file swap area */
 	SWP_DISCARDABLE = (1 << 2),	/* blkdev supports discard */
 	SWP_DISCARDING	= (1 << 3),	/* now discarding a free cluster */
 	SWP_SOLIDSTATE	= (1 << 4),	/* blkdev seeks are cheap */
Quoted 1 line

Hugh

Thanks,

Signature · 1 line
Suresh Jayaraman
#8 lore raw
Quoted 15 lines · Suresh Jayaraman
Quoted 14 lines · Hugh Dickins
Quoted 13 lines · Suresh Jayaraman
Quoted 7 lines · Hugh Dickins
Quoted 4 lines · Suresh Jayaraman

The call sequence is add_to_swap() -> get_swap_page() -> scan_swap_map() -> discard_swap_cluster() -> blkdev_issue_discard().

Wrapping the code around a NULL check fixes the Oops for me.

That's odd: scan_swap_map() should only discard_swap_cluster() if SWP_DISCARDABLE got set, and your first patch made sure that it wasn't.

I forgot to mention, this is not on loopback NFS mount but an remote NFS mount (so possibly s_bdev is not NULL) when doing swapon. The oops was triggered when memhog program tries to use the swap space on the newly created swapfile on NFS. I have not completely investigated the issue, perhaps s_bdev is not being set when it ought to be..

Quoted 7 lines
Quoted 3 lines

I'm happy to see your first patch already in 2.6.32-rc3, but still suspicious of this second patch you sent afterwards. A quick skim through your patchset suggests 23/31 is probably responsible:

Thanks for skimming through those patches. I noticed this already during my review and thought I had already fixed this, but apparently I missed out. I'll test after fixing this and report.

Sorry about the delay. I tested by fixing SWP_FILE macro only now after returning from vacation. I was not able to reproduce this. Please ignore the second patch and it's no longer necessary as noted by Hugh already.

Thanks,

Quoted 15 lines
Quoted 11 lines
include/linux/swap.h +1 -0
@@ -120,6 +120,7 @@ struct swap_extent {
 enum {
 	SWP_USED	= (1 << 0),	/* is slot in swap_info[] used? */
 	SWP_WRITEOK	= (1 << 1),	/* ok to write to this swap?	*/
+	SWP_FILE	= (1 << 2),	/* file swap area */
 	SWP_DISCARDABLE = (1 << 2),	/* blkdev supports discard */
 	SWP_DISCARDING	= (1 << 3),	/* now discarding a free cluster */
 	SWP_SOLIDSTATE	= (1 << 4),	/* blkdev seeks are cheap */
Quoted 1 line

Hugh

Thanks,

Signature · 1 line
Suresh Jayaraman