diff options
| author | Alex Elder | 2012-10-21 05:17:27 +0200 |
|---|---|---|
| committer | Alex Elder | 2012-10-27 00:18:08 +0200 |
| commit | db2388b6ee40a949084e4cdddc3b0a4357068a62 (patch) | |
| tree | d73ade991884c9d60a04cb3953e632964ac20fce /drivers/block/rbd.c | |
| parent | rbd: consolidate rbd_do_op() calls (diff) | |
| download | kernel-qcow2-linux-db2388b6ee40a949084e4cdddc3b0a4357068a62.tar.gz kernel-qcow2-linux-db2388b6ee40a949084e4cdddc3b0a4357068a62.tar.xz kernel-qcow2-linux-db2388b6ee40a949084e4cdddc3b0a4357068a62.zip | |
rbd: verify rbd image order value
This adds a verification that an rbd image's object order is
within the upper and lower bounds supported by this implementation.
It must be at least 9 (SECTOR_SHIFT), because the Linux bio system
assumes that minimum granularity.
It also must be less than 32 (at the moment anyway) because there
exist spots in the code that store the size of a "segment" (object
backing an rbd image) in a signed int variable, which can be 32 bits
including the sign. We should be able to relax this limit once
we've verified the code uses 64-bit types where needed.
Note that the CLI tool already limits the order to the range 12-25.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers/block/rbd.c')
| -rw-r--r-- | drivers/block/rbd.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index d0328835bbd9..4734446c3b5b 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -533,6 +533,16 @@ static bool rbd_dev_ondisk_valid(struct rbd_image_header_ondisk *ondisk) if (memcmp(&ondisk->text, RBD_HEADER_TEXT, sizeof (RBD_HEADER_TEXT))) return false; + /* The bio layer requires at least sector-sized I/O */ + + if (ondisk->options.order < SECTOR_SHIFT) + return false; + + /* If we use u64 in a few spots we may be able to loosen this */ + + if (ondisk->options.order > 8 * sizeof (int) - 1) + return false; + /* * The size of a snapshot header has to fit in a size_t, and * that limits the number of snapshots. |