From patchwork Fri Nov 4 08:34:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 15425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp255881wru; Fri, 4 Nov 2022 01:45:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4bkoZRCwALVs6wpdAirmsPr6TsyiGx87J7cfDv7a/popEDvWOjELWoPgSUaoWs4cB2o0QX X-Received: by 2002:a17:903:124c:b0:179:da2f:2463 with SMTP id u12-20020a170903124c00b00179da2f2463mr33904068plh.128.1667551544712; Fri, 04 Nov 2022 01:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667551544; cv=none; d=google.com; s=arc-20160816; b=0yS/ibnXj1F/CALDpVi16yHyh9p9D97O9WIGY66hiMn+GqvKx8uXjaT9EtKAktJr7e vrh9dK/7lsBZrexwnPce7DD4M4A4Z+8UuYBbPl4VQ2QpPq+4CheiHop4NPiKremnqYCA iQfiU0g1nlkjOIjvxxGWirDTAjTAwp6SZCp3s9EG/s1EPhmzbzbJrp4I+Cnxlb4TiRjx Lckjak1Gc9wy/nBFrHQEBWAdx3nDKxYHHrIYU0UBtCNXj4gasVOQySp2M376EHLQvGDS fV86cUHts2ovm73M8L4zJUNsw4hesGuOGbDagn3ehL+hia8FmjuqhOzM/j/usWloE9+r M/jw== 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=4jfdHHVsNHH2XLG0ckabTsX3HokyLPSsLjIq6+wD1i4=; b=Y9Xu+KH0tF5/9Ap3M0v7gk1nV1tCg8HjyPsH1682wmzsdASoV7cA+txGno8Sj3EYDY M9H3enZuYjdXIyND2cu5piZ8iDICp6WG++S09vEQvUOzU/2EZXqZBK0ysqdsGEi1Whaj 40vlsd6VGW+3n/+G5dmkbA8Ek/r7+AkpVCBgJBmVPi6tW2jwqYksm6uOFF6xpcaPbxI6 rrQvAkngWtFTHuKHUwuT57GUHAqxXjUCMmpm9dlMNHFeBXu9P/Si/6ZU7etZCjmnxPZd iPbD9t5EP3Q9ZZLZC23Q4bIywWXeINkmiqaY8Yrsza815OPrB49HzZO2sj3Y+4/G05UY zBvQ== 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 i5-20020a17090a718500b002131849ea4esi2777869pjk.140.2022.11.04.01.45.30; Fri, 04 Nov 2022 01:45:44 -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 S231294AbiKDIht (ORCPT + 99 others); Fri, 4 Nov 2022 04:37:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbiKDIhq (ORCPT ); Fri, 4 Nov 2022 04:37:46 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F876F77 for ; Fri, 4 Nov 2022 01:37:46 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N3YsZ3cBKz15MHy; Fri, 4 Nov 2022 16:37:38 +0800 (CST) Received: from huawei.com (10.67.175.83) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 4 Nov 2022 16:37:43 +0800 From: ruanjinjie To: , , , , , , , CC: Subject: [PATCH] vdpa_sim: fix possible memory leak in vdpasim_net_init() and vdpasim_blk_init() Date: Fri, 4 Nov 2022 16:34:23 +0800 Message-ID: <20221104083423.2090463-1-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.67.175.83] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemi500008.china.huawei.com (7.221.188.139) 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?1748554528507509644?= X-GMAIL-MSGID: =?utf-8?q?1748554528507509644?= If device_register() returns error in vdpasim_net_init() or vdpasim_blk_init(), name of kobject which is allocated in dev_set_name() called in device_add() is leaked. As comment of device_add() says, it should call put_device() to drop the reference count that was set in device_initialize() when it fails, so the name can be freed in kobject_cleanup(). Signed-off-by: ruanjinjie Acked-by: Jason Wang Reviewed-by: Stefano Garzarella --- drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 4 +++- drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c b/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c index c6db1a1baf76..f745926237a8 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c @@ -427,8 +427,10 @@ static int __init vdpasim_blk_init(void) int ret; ret = device_register(&vdpasim_blk_mgmtdev); - if (ret) + if (ret) { + put_device(&vdpasim_blk_mgmtdev); return ret; + } ret = vdpa_mgmtdev_register(&mgmt_dev); if (ret) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c index c3cb225ea469..11f5a121df24 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c @@ -305,8 +305,10 @@ static int __init vdpasim_net_init(void) int ret; ret = device_register(&vdpasim_net_mgmtdev); - if (ret) + if (ret) { + put_device(&vdpasim_net_mgmtdev); return ret; + } ret = vdpa_mgmtdev_register(&mgmt_dev); if (ret)