Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp220091pxb; Mon, 13 Sep 2021 17:29:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzC79xlFY8aK4TmgOrJp/mcnkCR+krjHiEV3c7GFcklG+4djTdhMkk4FhBpV6MDRs26gGwT X-Received: by 2002:aa7:d5c3:: with SMTP id d3mr14639508eds.151.1631579387654; Mon, 13 Sep 2021 17:29:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631579387; cv=none; d=google.com; s=arc-20160816; b=yIDJGHfyDqVNSHQfGQ5UZnLR07fcPeBK6rbTdIFC4p44SM63nhqXWu5amKURuoOIsN NIRGrPtQQVtjfGWQg4YGlTS2jq3UiMlEwk+l9VMZ61Ln7oOW+Ypc7nz55IoGxZvH0gPw W8QWBQ1INy91ezBLdBfEfYnjMfKlB3c66+rjojF1CfV+V71XwYC7V98XjSQ7Gx/K5nM0 VJtDJBGGXt9jRovjkRIKoKRJ79SUmwEP8eDMf6weB8piFkAiUroew53uqHIpfDyEpWxa FiUnsiOX5nP9ufyYc4ZlJQhMPXg+/1FTcyfk9iY+0u3Ao+3zPMdUTUD1EpAHW9GsULUj XiQQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pjSVpAuKLubHIajPsrQwBEzqROdzWkLBGS3yoCttANY=; b=RoKiYm8+KzhGpU1fktKEtk6709kC0dUHXpMTeICpVLb+IYoLRDtA8FUS2bUIrC+UFA lKAd5CGwzzZPkRIBO1XUplezaZ1EsVenstZtNItv0bGGBYV5pFWwCEOeNSqmKUqKVXNp ccqkt57EtALxnht7BbJKh/9YdFbbwtsBaowesSFTdZGJrvw99b3sHVXmS/bLLjSYk03q apu2kr2TIOs+KlKt7AupUrwQvF1/HmJeh+2HVtTAM6O1vKT17FMl/JJv8Cwmu+zGrw+J 9RfcM61TQ7+ujDimbY7ExckJ3lxGFg5/x21Po7LLJW7ntnSfzjRD3HbeNBaX72ZumZ8K VdYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=n7Jt05By; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (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 x18si9502321edl.617.2021.09.13.17.29.22; Mon, 13 Sep 2021 17:29:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@linuxfoundation.org header.s=korg header.b=n7Jt05By; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244342AbhIMOQE (ORCPT + 99 others); Mon, 13 Sep 2021 10:16:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:34374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242130AbhIMONO (ORCPT ); Mon, 13 Sep 2021 10:13:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 55E4461AD0; Mon, 13 Sep 2021 13:42:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631540577; bh=cHZumzlrM6+tZYz5z+PpTZySAuJUyF2i/7mgvc4lVKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n7Jt05ByWzpYGlp7yGeA+1KO7ZEYLhUdlRECRU+vHeh2WgRdAzLceMbKXDuYg6wn/ tmiGfmn3NtL/Nsd/4f6TSzOVRRPDdvwLS0JMQG1dSJJMTkULLuZ9vdQGSODel/fKZ5 ITozcSW5YcTLYRdPSEf/WJRQfDZYNLFoEcVJYCGg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zenghui Yu , Kalle Valo , Sasha Levin Subject: [PATCH 5.13 250/300] bcma: Fix memory leak for internally-handled cores Date: Mon, 13 Sep 2021 15:15:11 +0200 Message-Id: <20210913131117.794888104@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131109.253835823@linuxfoundation.org> References: <20210913131109.253835823@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zenghui Yu [ Upstream commit b63aed3ff195130fef12e0af590f4838cf0201d8 ] kmemleak reported that dev_name() of internally-handled cores were leaked on driver unbinding. Let's use device_initialize() to take refcounts for them and put_device() to properly free the related stuff. While looking at it, there's another potential issue for those which should be *registered* into driver core. If device_register() failed, we put device once and freed bcma_device structures. In bcma_unregister_cores(), they're treated as unregistered and we hit both UAF and double-free. That smells not good and has also been fixed now. Fixes: ab54bc8460b5 ("bcma: fill core details for every device") Signed-off-by: Zenghui Yu Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20210727025232.663-2-yuzenghui@huawei.com Signed-off-by: Sasha Levin --- drivers/bcma/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 6535614a7dc1..1df2b5801c3b 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c @@ -236,6 +236,7 @@ EXPORT_SYMBOL(bcma_core_irq); void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) { + device_initialize(&core->dev); core->dev.release = bcma_release_core_dev; core->dev.bus = &bcma_bus_type; dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index); @@ -277,11 +278,10 @@ static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core) { int err; - err = device_register(&core->dev); + err = device_add(&core->dev); if (err) { bcma_err(bus, "Could not register dev for core 0x%03X\n", core->id.id); - put_device(&core->dev); return; } core->dev_registered = true; @@ -372,7 +372,7 @@ void bcma_unregister_cores(struct bcma_bus *bus) /* Now noone uses internally-handled cores, we can free them */ list_for_each_entry_safe(core, tmp, &bus->cores, list) { list_del(&core->list); - kfree(core); + put_device(&core->dev); } } -- 2.30.2