Unverified Commit 2f4cf035 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7401 nvme-core: check for too small lba shift 

Merge Pull Request from: @ci-robot 
 
PR sync from: Baogen Shang <baogen.shang@outlook.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/I6V6IWES53RJ5FIOLULLKX373KPT46MZ/ 
 
https://gitee.com/openeuler/kernel/issues/I9J6AL 
 
Link:https://gitee.com/openeuler/kernel/pulls/7401

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f9f2b4a0 dd9f3c62

drivers/nvme/host/core.c

+3 −2
Original line number Diff line number Diff line
@@ -2038,9 +2038,10 @@ static void nvme_update_disk_info(struct gendisk *disk, 


	/*

	 * The block layer can't support LBA sizes larger than the page size

	 * yet, so catch this early and don't allow block I/O.

	 * or smaller than a sector size yet, so catch this early and don't

	 * allow block I/O.

	 */

	if (ns->lba_shift > PAGE_SHIFT) {

	if (ns->lba_shift > PAGE_SHIFT || ns->lba_shift < SECTOR_SHIFT) {

		capacity = 0;

		bs = (1 << 9);

	}