diff options
author | Benny Halevy <bhalevy@panasas.com> | 2011-02-22 15:56:01 -0800 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-03-11 15:38:45 -0500 |
commit | 75247affd7930cc3dcf57f850f0d7898379ef3b3 (patch) | |
tree | b0a9f986d5d209d4ab422525a16cfdc38da917da | |
parent | 36fe432d33e078caee5c954e15e929819c2cacae (diff) | |
download | linux-75247affd7930cc3dcf57f850f0d7898379ef3b3.tar.gz linux-75247affd7930cc3dcf57f850f0d7898379ef3b3.tar.bz2 linux-75247affd7930cc3dcf57f850f0d7898379ef3b3.zip |
NFSv4.1: reject zero layout with zeroed stripe unit
Allowing stripe_unit==0 causes the client to crash later on
when dividing by zero.
Reported-by: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | fs/nfs/nfs4filelayout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 7e1d4571b7b2..428558464817 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -369,8 +369,8 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo, goto out; } - if (fl->stripe_unit % PAGE_SIZE) { - dprintk("%s Stripe unit (%u) not page aligned\n", + if (!fl->stripe_unit || fl->stripe_unit % PAGE_SIZE) { + dprintk("%s Invalid stripe unit (%u)\n", __func__, fl->stripe_unit); goto out; } |