Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp595004pxb; Thu, 31 Mar 2022 12:28:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyugr795MwhkSXvLLnr3xSwIEHMgMvIOe3ammEQ8Tki69fDlzj/5j57p/8nxZnSILNTEIMx X-Received: by 2002:aa7:88d4:0:b0:4fd:ad26:c52f with SMTP id k20-20020aa788d4000000b004fdad26c52fmr6266704pff.25.1648754917128; Thu, 31 Mar 2022 12:28:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648754917; cv=none; d=google.com; s=arc-20160816; b=qJuV6tkIYYapafNZN7PKoHGhRRqJ+E7AqKbP/ZlHKeSBh8MJe1fiRvUyEnb63qhVG6 ocjvc8K9vAlBaB0N8V7AeS3RAhd2SxV/9LApGgV8B45L2DUOKvHTZkKkYff6R0S2fjCy IJeWKVRimr+CpinCOo14vdBObnzv5C4Yo6hC4hO60BsbjQO+s+O4vs5++xAmrE4ewb15 LVRBAn0zKvOK77ZNVe/B4F0hBktWWD6ap2qfM9xpSyPuJpdj8ljh9sEMNZyu7QXcmbWG hVeDfHvRX2z4SwhiSK66lonDuRd23xcm7C/QGusMI9oywZ6nBzVC/9zTY4ztLOE1jEHg 9R1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=13ejWdrtct9d00T6Z2awIFWRaRFslT93aDeHzosEfvU=; b=vaCYvfyeO4SrfjH4AdU2HZGqWbYI7A+DeFSmrwNDhR97kN/syMrocoJjEENCkRbynC KcXAdfggLQNkyUNtbPYTjbyleJXqrDr3kyiqxK2l5TVVken1LzjcEC74AzI55y+V8n3a eC93c+vU5jwqFtXJtIo906DNLOkar0Fkc0roG7J9IAxuau7hWlKileMd+ft70apubAEy VzKgYxJj0F+jyxf0xxLAFIB0I3KD6Kaw1rKsBhZ58Fgz2LypO4MEnRDLTjRuZOm2x9QA RYx43QMs4O5B1G/JlPbEySjENNQG5vx+MUCn28eWwl9mL8cYt/6lE2KuPHAgGkVekBDF odvw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q7-20020a170902b10700b0015468e69be7si126571plr.366.2022.03.31.12.28.22; Thu, 31 Mar 2022 12:28:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235423AbiCaMDl (ORCPT + 99 others); Thu, 31 Mar 2022 08:03:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235643AbiCaMCd (ORCPT ); Thu, 31 Mar 2022 08:02:33 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EFB81C7E92; Thu, 31 Mar 2022 04:59:33 -0700 (PDT) Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KThdB4XwFzgYHy; Thu, 31 Mar 2022 19:57:50 +0800 (CST) Received: from dggpemm500017.china.huawei.com (7.185.36.178) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Thu, 31 Mar 2022 19:59:30 +0800 Received: from huawei.com (10.175.101.6) by dggpemm500017.china.huawei.com (7.185.36.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Thu, 31 Mar 2022 19:59:29 +0800 From: Wenchao Hao To: "James E . J . Bottomley" , "Martin K . Petersen" , , CC: , Wenchao Hao , Subject: [PATCH] scsi: sd: cleanup gendisk if device_add_disk() failed Date: Thu, 31 Mar 2022 21:10:19 -0400 Message-ID: <20220401011018.1026553-1-haowenchao@huawei.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500017.china.huawei.com (7.185.36.178) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_12_24, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We forget to call blk_cleanup_disk() when device_add_disk() failed. Which would cause memory leak of gendisk and sched_tags alloced in elevator_init_mq() Reference:https://syzkaller.appspot.com/x/log.txt?x=13b41dcb700000 Reported-and-tested-by: syzbot+f08c77040fa163a75a46@syzkaller.appspotmail.com Signed-off-by: Wenchao Hao --- drivers/scsi/sd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index a390679cf458..4620a1158272 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3475,6 +3475,7 @@ static int sd_probe(struct device *dev) error = device_add_disk(dev, gd, NULL); if (error) { put_device(&sdkp->disk_dev); + blk_cleanup_disk(gd); goto out; } -- 2.32.0