Commit 0914bb96 authored Jul 04, 2018 by Dan Carpenter Committed by Anna Schumaker Jul 30, 2018

pnfs/blocklayout: off by one in bl_map_stripe()



"dev->nr_children" is the number of children which were parsed
successfully in bl_parse_stripe().  It could be all of them and then, in
that case, it is equal to v->stripe.volumes_count.  Either way, the >
should be >= so that we don't go beyond the end of what we're supposed
to.

Fixes: 5c83746a ("pnfs/blocklayout: in-kernel GETDEVICEINFO XDR parsing")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: stable@vger.kernel.org # 3.17+
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

parent 23a88ade

fs/nfs/blocklayout/dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ static bool bl_map_stripe(struct pnfs_block_dev *dev, u64 offset,
		chunk = div_u64(offset, dev->chunk_size);
		div_u64_rem(chunk, dev->nr_children, &chunk_idx);

		if (chunk_idx > dev->nr_children) {
		if (chunk_idx >= dev->nr_children) {
		dprintk("%s: invalid chunk idx %d (%lld/%lld)\n",
		__func__, chunk_idx, offset, dev->chunk_size);
		/* error, should not happen */

Admin message