From patchwork Mon Aug 17 15:16:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247829 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2834119ilo; Mon, 17 Aug 2020 10:45:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVATXXds5b+oek/h0KWXd7gBxdN1Lz794lt3a4G8h2FX7KoStO5drXFmtQxNgqLrvwkdz9 X-Received: by 2002:a05:6402:1545:: with SMTP id p5mr15559654edx.388.1597686351968; Mon, 17 Aug 2020 10:45:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597686351; cv=none; d=google.com; s=arc-20160816; b=LPylQCFvq6YbMAlb0m9qKxsHGPZ0yKLLSTowKsam6PqqpiEqCZXENsU26iiKIi05Ra pAhGKeySBmxmi2AdbkM0OLyamrAcs5Td7S+pd2GTuU4IjB2tA8Kca+vsLams75PvZiI5 2e30ApmK498e9vQK5+tSba/6zhhVJUvhQu5mUfi3TqzOy5ysMpb+m9G05DOZEuwmC6IL ZwkIWFxGaLK3q5Xpb1Nv/nKFsGtHxdFjE7WAEjfennloKwb50qwdiUHtt0b0whL1a558 4TEp5hwN5uKZY7tpE444SI3R0C1524o9xQASkQqWK22iCiZTP3ILdVEtgAkwWHujGRYz V8yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rnn3X02f/1xfdaIx4vXSDlUQhtIrh1P9iryAtEO4aZY=; b=okUX8PsMAc5Vz1+G2E4I1B7nuP+F2UAJ70FHAk+f5SEnRuRNFAzOKG/CI0XC5Xfu8T 4JRMlnVRKnuKP6Y0em48bE1RLXmqoEyD8qu2YMOejLLZjWmYxyprXHsSCzMHpq1NxgdX YT+69rgn6YGvjSp4k+VlAWVvRzhRew4JdKpSPZABHtmU8K0QUajWGGDBOKfcIGppidEu MlHK250Lzo4JnDDhjmTVjvaTh1L5L3Ffr5oYTyjtgProQt2kB42XYVRh14eusKzd49M/ 8gbuhFEmstsaDGl8Y1CdrrfVzMb5bO/dnh8XqZyzbTeElT/zkdzvj7otoSIPsrKbXfgW J2dQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=itJtwCji; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pg13si11736900ejb.681.2020.08.17.10.45.51; Mon, 17 Aug 2020 10:45:51 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=itJtwCji; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389880AbgHQRpu (ORCPT + 15 others); Mon, 17 Aug 2020 13:45:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:49872 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388782AbgHQQOL (ORCPT ); Mon, 17 Aug 2020 12:14:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CC2CB20658; Mon, 17 Aug 2020 16:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680850; bh=X2PAq8MhO/WAqxIb8JEj6J3/yTWHfDymhDYywj0ZnmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=itJtwCjiEtvd2sl0mA8/IOazUa3rQqlhFBh8LUaocfZCGFgi5f+L0e1ZztX9nnjrV ahmGOP4wYaqkNkw9n6zQNDJPMMV10YY24EjuJh6RPYqtuGc4SBNDQ0I3zlCS5D9dGH JV6CDfjODgWKUfoGVFmSY2GFtM/wGAuXvTXJ+kT0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ming Lei , Douglas Gilbert , John Garry , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.19 083/168] scsi: scsi_debug: Add check for sdebug_max_queue during module init Date: Mon, 17 Aug 2020 17:16:54 +0200 Message-Id: <20200817143737.872833564@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143733.692105228@linuxfoundation.org> References: <20200817143733.692105228@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Garry [ Upstream commit c87bf24cfb60bce27b4d2c7e56ebfd86fb9d16bb ] sdebug_max_queue should not exceed SDEBUG_CANQUEUE, otherwise crashes like this can be triggered by passing an out-of-range value: Hardware name: Huawei D06 /D06, BIOS Hisilicon D06 UEFI RC0 - V1.16.01 03/15/2019 pstate: 20400009 (nzCv daif +PAN -UAO BTYPE=--) pc : schedule_resp+0x2a4/0xa70 [scsi_debug] lr : schedule_resp+0x52c/0xa70 [scsi_debug] sp : ffff800022ab36f0 x29: ffff800022ab36f0 x28: ffff0023a935a610 x27: ffff800008e0a648 x26: 0000000000000003 x25: ffff0023e84f3200 x24: 00000000003d0900 x23: 0000000000000000 x22: 0000000000000000 x21: ffff0023be60a320 x20: ffff0023be60b538 x19: ffff800008e13000 x18: 0000000000000000 x17: 0000000000000000 x16: 0000000000000000 x15: 0000000000000000 x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000000 x11: 0000000000000000 x10: 0000000000000000 x9 : 0000000000000001 x8 : 0000000000000000 x7 : 0000000000000000 x6 : 00000000000000c1 x5 : 0000020000200000 x4 : dead0000000000ff x3 : 0000000000000200 x2 : 0000000000000200 x1 : ffff800008e13d88 x0 : 0000000000000000 Call trace: schedule_resp+0x2a4/0xa70 [scsi_debug] scsi_debug_queuecommand+0x2c4/0x9e0 [scsi_debug] scsi_queue_rq+0x698/0x840 __blk_mq_try_issue_directly+0x108/0x228 blk_mq_request_issue_directly+0x58/0x98 blk_mq_try_issue_list_directly+0x5c/0xf0 blk_mq_sched_insert_requests+0x18c/0x200 blk_mq_flush_plug_list+0x11c/0x190 blk_flush_plug_list+0xdc/0x110 blk_finish_plug+0x38/0x210 blkdev_direct_IO+0x450/0x4d8 generic_file_read_iter+0x84/0x180 blkdev_read_iter+0x3c/0x50 aio_read+0xc0/0x170 io_submit_one+0x5c8/0xc98 __arm64_sys_io_submit+0x1b0/0x258 el0_svc_common.constprop.3+0x68/0x170 do_el0_svc+0x24/0x90 el0_sync_handler+0x13c/0x1a8 el0_sync+0x158/0x180 Code: 528847e0 72a001e0 6b00003f 540018cd (3941c340) In addition, it should not be less than 1. So add checks for these, and fail the module init for those cases. [mkp: changed if condition to match error message] Link: https://lore.kernel.org/r/1594297400-24756-2-git-send-email-john.garry@huawei.com Fixes: c483739430f1 ("scsi_debug: add multiple queue support") Reviewed-by: Ming Lei Acked-by: Douglas Gilbert Signed-off-by: John Garry Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/scsi_debug.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.25.1 diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index a1dbae806fdea..d2b045eb72742 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -5384,6 +5384,12 @@ static int __init scsi_debug_init(void) pr_err("submit_queues must be 1 or more\n"); return -EINVAL; } + + if ((sdebug_max_queue > SDEBUG_CANQUEUE) || (sdebug_max_queue < 1)) { + pr_err("max_queue must be in range [1, %d]\n", SDEBUG_CANQUEUE); + return -EINVAL; + } + sdebug_q_arr = kcalloc(submit_queues, sizeof(struct sdebug_queue), GFP_KERNEL); if (sdebug_q_arr == NULL)