From patchwork Thu Feb 2 16:24:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Henzl X-Patchwork-Id: 650572 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71D03C636D6 for ; Thu, 2 Feb 2023 16:25:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232053AbjBBQZw (ORCPT ); Thu, 2 Feb 2023 11:25:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbjBBQZu (ORCPT ); Thu, 2 Feb 2023 11:25:50 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0366530EF for ; Thu, 2 Feb 2023 08:24:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675355096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3RjW4DOZCvhQd1bXgafs79oHh0ytkPtehsJxnCjunDQ=; b=XBknLssfSC0HDIf0VzeIFhy4Qyi7DqdNUq6LZrOwwT/xEaetZEYt1hOvzKlNonbZ+Oi/0Z aUgGpvr22OQiIYu7N6GWBYKdB3Z786daCt9EqVxWpAGD/Bv9fbC+rlKSXolnwq4Ozf0OYC lqGW24M3woTOqLMnNizQgZ9Fgr9yYb8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-86-KZpaF6VBNI2RzjwFDGD-XA-1; Thu, 02 Feb 2023 11:24:55 -0500 X-MC-Unique: KZpaF6VBNI2RzjwFDGD-XA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6AF71296A606; Thu, 2 Feb 2023 16:24:55 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-192-75.brq.redhat.com [10.40.192.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6076404BEC0; Thu, 2 Feb 2023 16:24:54 +0000 (UTC) From: Tomas Henzl To: linux-scsi@vger.kernel.org Cc: mikoxyzzz@gmail.com Subject: [PATCH v2 4/4] ses: fix slab-out-of-bounds reported by KASAN in ses_intf_remove Date: Thu, 2 Feb 2023 17:24:51 +0100 Message-Id: <20230202162451.15346-5-thenzl@redhat.com> In-Reply-To: <20230202162451.15346-1-thenzl@redhat.com> References: <20230202162451.15346-1-thenzl@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org A fix for: BUG: KASAN: slab-out-of-bounds in ses_intf_remove+0x23f/0x270 [ses] Read of size 8 at addr ffff88a10d32e5d8 by task rmmod/12013 When edev->components is zero, accessing edev->component[0] members is wrong. Signed-off-by: Tomas Henzl --- drivers/scsi/ses.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index dbfe12f63c98..7a9eb54e8808 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c @@ -850,7 +850,8 @@ static void ses_intf_remove_enclosure(struct scsi_device *sdev) kfree(ses_dev->page2); kfree(ses_dev); - kfree(edev->component[0].scratch); + if (edev->components) + kfree(edev->component[0].scratch); put_device(&edev->edev); enclosure_unregister(edev);