linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Omar Sandoval <osandov@osandov.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: "Darrick J . Wong" <darrick.wong@oracle.com>,
	linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	Jan Kara <jack@suse.cz>, Aleksei Besogonov <cyberax@amazon.com>,
	kernel-team@fb.com
Subject: Re: [PATCH v2 1/2] iomap: provide more useful errors for invalid swap files
Date: Wed, 16 May 2018 10:32:51 -0700	[thread overview]
Message-ID: <20180516173251.GA29231@vader> (raw)
In-Reply-To: <20180516172531.GA13464@infradead.org>

On Wed, May 16, 2018 at 10:25:31AM -0700, Christoph Hellwig wrote:
> On Wed, May 16, 2018 at 09:45:50AM -0700, Omar Sandoval wrote:
> > +	if ((iomap->type != IOMAP_MAPPED && iomap->type != IOMAP_UNWRITTEN) ||
> > +	    iomap->addr == IOMAP_NULL_ADDR) {
> > +		pr_err("swapon: file has unallocated extents\n");
> > +		return -EINVAL;
> > +	}
> 
> The two are really different cases - IOMAP_NULL_ADDR shouldn't really
> happen for any of the above.  Although we might have to move the
> inline check before the type check above for the message to make sense.
> 
> I have a patch in the local queue that makes inline a type instead of
> a flag, btw as it really isn't a flag.

So something like this, moving the inline check and removing the hole
check since that doesn't make sense for mapped or unwritten? Then the
inline flag check can be converted to a type check.

diff --git a/fs/iomap.c b/fs/iomap.c
index d193390a1c20..89517442e296 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -1214,26 +1214,37 @@ static loff_t iomap_swapfile_activate_actor(struct inode *inode, loff_t pos,
 	struct iomap_swapfile_info *isi = data;
 	int error;
 
+	/* No inline data. */
+	if (iomap->flags & IOMAP_F_DATA_INLINE) {
+		pr_err("swapon: file is inline\n");
+		return -EINVAL;
+	}
+
 	/* Skip holes. */
 	if (iomap->type == IOMAP_HOLE)
 		goto out;
 
-	/* Only one bdev per swap file. */
-	if (iomap->bdev != isi->sis->bdev)
-		goto err;
-
 	/* Only real or unwritten extents. */
-	if (iomap->type != IOMAP_MAPPED && iomap->type != IOMAP_UNWRITTEN)
-		goto err;
+	if (iomap->type != IOMAP_MAPPED && iomap->type != IOMAP_UNWRITTEN) {
+		pr_err("swapon: file has unallocated extents\n");
+		return -EINVAL;
+	}
 
-	/* No uncommitted metadata or shared blocks or inline data. */
-	if (iomap->flags & (IOMAP_F_DIRTY | IOMAP_F_SHARED |
-			    IOMAP_F_DATA_INLINE))
-		goto err;
+	/* No uncommitted metadata or shared blocks. */
+	if (iomap->flags & IOMAP_F_DIRTY) {
+		pr_err("swapon: file is not committed\n");
+		return -EINVAL;
+	}
+	if (iomap->flags & IOMAP_F_SHARED) {
+		pr_err("swapon: file has shared extents\n");
+		return -EINVAL;
+	}
 
-	/* No null physical addresses. */
-	if (iomap->addr == IOMAP_NULL_ADDR)
-		goto err;
+	/* Only one bdev per swap file. */
+	if (iomap->bdev != isi->sis->bdev) {
+		pr_err("swapon: file is on multiple devices\n");
+		return -EINVAL;
+	}
 
 	if (isi->iomap.length == 0) {
 		/* No accumulated extent, so just store it. */
@@ -1250,9 +1261,6 @@ static loff_t iomap_swapfile_activate_actor(struct inode *inode, loff_t pos,
 	}
 out:
 	return count;
-err:
-	pr_err("swapon: file cannot be used for swap\n");
-	return -EINVAL;
 }
 
 /*

  reply	other threads:[~2018-05-16 17:32 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-16 16:45 [PATCH v2 0/2] iomap: swapfile tweaks Omar Sandoval
2018-05-16 16:45 ` [PATCH v2 1/2] iomap: provide more useful errors for invalid swap files Omar Sandoval
2018-05-16 16:54   ` Darrick J. Wong
2018-05-16 17:25   ` Christoph Hellwig
2018-05-16 17:32     ` Omar Sandoval [this message]
2018-05-16 17:46       ` Christoph Hellwig
2018-05-16 18:11         ` Darrick J. Wong
2018-05-16 18:22           ` Christoph Hellwig
2018-05-16 16:45 ` [PATCH v2 2/2] iomap: don't allow holes in swapfiles Omar Sandoval

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180516173251.GA29231@vader \
    --to=osandov@osandov.com \
    --cc=cyberax@amazon.com \
    --cc=darrick.wong@oracle.com \
    --cc=hch@infradead.org \
    --cc=jack@suse.cz \
    --cc=kernel-team@fb.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).