From patchwork Tue Jan 3 12:57:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 38410 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4590961wrt; Tue, 3 Jan 2023 04:43:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXtftVfoMVuErmZm5IqMffIMNOcR0eURGAPlaInEF3hIg4J5KK8mVEXiePDtYspEZpcwpVrz X-Received: by 2002:a17:903:493:b0:192:50fe:5051 with SMTP id jj19-20020a170903049300b0019250fe5051mr49526412plb.26.1672749816521; Tue, 03 Jan 2023 04:43:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672749816; cv=none; d=google.com; s=arc-20160816; b=mkHoAxQIb2tTkykMLVVEQ2wIYjraV7LpSToB0ST21qbJZXp1T3qJZphoibiZUnW7PA 8Et3FSoQGvQuvUtFZALXmWLBPZqA6DBKe0nWLyL6CuMpm3NmLKCwJiGrirLDULfAIY/j vFEJRYfTfyFbkkdoxgcSNZw30nJIKr7Y+gixiCnAeTzeFdMsOazc9pCZOClqyjQo+Wlw 9dwckxQY5FMbVVGpYMB3idr6AIcUaDunqG27YOMhB+DmJUdB/Kopr9VPkvw8Wpds2SBD THq2wSIz5BsO9DUgxOEcxDmq51z2WZoy/drx2/9eb6dF8uavmQZA/qlqYpsbDXXqtndD ONZQ== 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=+/Zenq7iZSBv/jrC/UB348pEWCW2dU6d5F97ujc9Vpo=; b=Uhx5UWJp3HE4bFGTtTZOGoYVY9BzUiMK6Ao40X3pqZZuUj7vEF0xo549DbaaDUU7KI GLFLY9IUyiADdGbQYsMutcsR6Q7t04ePpO0xaWw1j2kVH9otX1fjDp2z4KCoD/Nw3P5A 2LKxhUmlh2YbX9nSGYLwY0NCMFjFdRoLiDDzDGunL17KDN4zkfOYnjPVhzG/SdYhlkD+ kEa/pPYZ1gCid5qahe90qxPOzlqQs+qRiXmP4FbssiiscRltbBEQitVb64ncG8cFG2/M nqU1ASWpW2iP27jMB5zZRjqEltyGEGedhtJNnfb6nW9GExrwkh+6F0/RK6AhUBw56rur Y5ww== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o8-20020a654588000000b00457dc916cd8si31456784pgq.152.2023.01.03.04.43.23; Tue, 03 Jan 2023 04:43:36 -0800 (PST) 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 S237005AbjACMiv (ORCPT + 99 others); Tue, 3 Jan 2023 07:38:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbjACMiu (ORCPT ); Tue, 3 Jan 2023 07:38:50 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 573502BF2; Tue, 3 Jan 2023 04:38:48 -0800 (PST) Received: from dggpemm500007.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NmXLl092KzJqsQ; Tue, 3 Jan 2023 20:37:35 +0800 (CST) Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 3 Jan 2023 20:38:45 +0800 From: Yang Yingliang To: , CC: , , , Subject: [PATCH] powercap: fix possible name leak in powercap_register_zone() Date: Tue, 3 Jan 2023 20:57:26 +0800 Message-ID: <20230103125726.681099-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754005311527969341?= X-GMAIL-MSGID: =?utf-8?q?1754005311527969341?= In the error path after calling dev_set_name(), the device name is leaked. To fix this, calling dev_set_name() before device_register(), and call put_device() if it returns error. All the resources is released in powercap_release(), so it can return from powercap_register_zone() directly. Fixes: 75d2364ea0ca ("PowerCap: Add class driver") Signed-off-by: Yang Yingliang --- drivers/powercap/powercap_sys.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c index 1f968353d479..e180dee0f83d 100644 --- a/drivers/powercap/powercap_sys.c +++ b/drivers/powercap/powercap_sys.c @@ -530,9 +530,6 @@ struct powercap_zone *powercap_register_zone( power_zone->name = kstrdup(name, GFP_KERNEL); if (!power_zone->name) goto err_name_alloc; - dev_set_name(&power_zone->dev, "%s:%x", - dev_name(power_zone->dev.parent), - power_zone->id); power_zone->constraints = kcalloc(nr_constraints, sizeof(*power_zone->constraints), GFP_KERNEL); @@ -555,9 +552,16 @@ struct powercap_zone *powercap_register_zone( power_zone->dev_attr_groups[0] = &power_zone->dev_zone_attr_group; power_zone->dev_attr_groups[1] = NULL; power_zone->dev.groups = power_zone->dev_attr_groups; + dev_set_name(&power_zone->dev, "%s:%x", + dev_name(power_zone->dev.parent), + power_zone->id); result = device_register(&power_zone->dev); - if (result) - goto err_dev_ret; + if (result) { + put_device(&power_zone->dev); + mutex_unlock(&control_type->lock); + + return ERR_PTR(result); + } control_type->nr_zones++; mutex_unlock(&control_type->lock);