Commit 5ffdff81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.5-2020-01-16' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "Three fixes that should go into this release:

   - The 32-bit segment size fix that I mentioned last week (Ming)

   - Use uint for the block size (Mikulas)

   - A null_blk zone write handling fix (Damien)"

* tag 'block-5.5-2020-01-16' of git://git.kernel.dk/linux-block:
  block: fix an integer overflow in logical block size
  null_blk: Fix zone write handling
  block: fix get_max_segment_size() overflow on 32bit arch
parents 575966e0 ad6bf88a

block/blk-merge.c

+7 −2
Original line number Diff line number Diff line
@@ -164,8 +164,13 @@ static inline unsigned get_max_segment_size(const struct request_queue *q, 
	unsigned long mask = queue_segment_boundary(q);



	offset = mask & (page_to_phys(start_page) + offset);

	return min_t(unsigned long, mask - offset + 1,

		     queue_max_segment_size(q));



	/*

	 * overflow may be triggered in case of zero page physical address

	 * on 32bit arch, use queue's max segment size when that happens.

	 */

	return min_not_zero(mask - offset + 1,

			(unsigned long)queue_max_segment_size(q));

}



/**

block/blk-settings.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ EXPORT_SYMBOL(blk_queue_max_segment_size); 
 *   storage device can address.  The default of 512 covers most

 *   hardware.

 **/

void blk_queue_logical_block_size(struct request_queue *q, unsigned short size)

void blk_queue_logical_block_size(struct request_queue *q, unsigned int size)

{

	q->limits.logical_block_size = size;

drivers/block/null_blk_zoned.c

+3 −1
Original line number Diff line number Diff line
@@ -129,11 +129,13 @@ static blk_status_t null_zone_write(struct nullb_cmd *cmd, sector_t sector, 
		return BLK_STS_IOERR;

	case BLK_ZONE_COND_EMPTY:

	case BLK_ZONE_COND_IMP_OPEN:

	case BLK_ZONE_COND_EXP_OPEN:

	case BLK_ZONE_COND_CLOSED:

		/* Writes must be at the write pointer position */

		if (sector != zone->wp)

			return BLK_STS_IOERR;



		if (zone->cond == BLK_ZONE_COND_EMPTY)

		if (zone->cond != BLK_ZONE_COND_EXP_OPEN)

			zone->cond = BLK_ZONE_COND_IMP_OPEN;



		zone->wp += nr_sectors;

drivers/md/dm-snap-persistent.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/dm-bufio.h>



#define DM_MSG_PREFIX "persistent snapshot"

#define DM_CHUNK_SIZE_DEFAULT_SECTORS 32	/* 16KB */

#define DM_CHUNK_SIZE_DEFAULT_SECTORS 32U	/* 16KB */



#define DM_PREFETCH_CHUNKS		12

drivers/md/raid0.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf) 
	char b[BDEVNAME_SIZE];

	char b2[BDEVNAME_SIZE];

	struct r0conf *conf = kzalloc(sizeof(*conf), GFP_KERNEL);

	unsigned short blksize = 512;

	unsigned blksize = 512;



	*private_conf = ERR_PTR(-ENOMEM);

	if (!conf)

CRA Git | Maintained and supported by SUSTech CRA and CCSE