From patchwork Sat Nov 12 09:29:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 19152 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1191907wru; Sat, 12 Nov 2022 01:34:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf4pxbu0fj0brssgiV03cHCcSgNADDqbPwJqUv4+4zVLuw5ARjhpeTRQL0BpU6KbMmZqS26A X-Received: by 2002:a17:907:9618:b0:78e:17ad:ba62 with SMTP id gb24-20020a170907961800b0078e17adba62mr4603425ejc.719.1668245684644; Sat, 12 Nov 2022 01:34:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668245684; cv=none; d=google.com; s=arc-20160816; b=ogniBNt4AGbbX81VPJMYfMbFSWRdG6EkoHKGh2LlJ5yPvmcdMoC5TGyBaT145X91ia 8/43RI/VsPZjougt5GOCrkWvC9Gh1RGuubaxDUiJSyHGdWPiofjyAnWqjJaUa3ts8hFC Qd+ItDaApQwej4/ufkA6roafJZ9+qDj2H1uFtIiFHjzFup1Je7BKBt/qtnkO8pIvopK3 C75SMQkggvLMrwk8SUGbVuAkOGIZGoqzMXQCs6ICS/V0jW3cKhcqWv2D0NKcWXz+oUaW lsuRAYTfU/WuWPdnkY7oT/sXuyhCk5ynNgkxbDOgz0bXOMzUy/BJHJSY2Nnsz+tmaDbP NbRw== 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=bgei0G7J0hn1J9ahNNtVbNjaoXg+1srShnpAYNrbfbg=; b=Wuf6s2Tw8o2BbEMthYjILFppEmXj6mcnbvWOUEec7s9d33HVodFQl32Lgk1pc3KNnG /UOuG03qIoe9xhUcUcJFe2yNPk1b5hYZf8YyGCTRZMksui6pZXV+/B6fy9FpXOP2otHH MHLu2F6wmrzqMoZEg6cYdwmaYUdSZFxxcsMMzeI0SZ2886hiy2l6M6gNShO27AFoywoK cCkJkAzrBnLXl4y0CLewlOexKw6aZwqRHS9SKFTwsw3GwwPWyuPq0z6wZZ/lLEA3rCJI ZU8p9fumkWqm+wyB82niwXh5GdwS2q46H1iOsdw1NVRNfhwTtFJazVQ7ZMvyHPOLFeKV Ogwg== 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 cs12-20020a170906dc8c00b00780e022dfb8si4487023ejc.494.2022.11.12.01.34.20; Sat, 12 Nov 2022 01:34:44 -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 S234627AbiKLJbF (ORCPT + 99 others); Sat, 12 Nov 2022 04:31:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233223AbiKLJbD (ORCPT ); Sat, 12 Nov 2022 04:31:03 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7482114099 for ; Sat, 12 Nov 2022 01:31:02 -0800 (PST) Received: from dggpemm500024.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N8Vg83Zq1z15MY2; Sat, 12 Nov 2022 17:30:44 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500024.china.huawei.com (7.185.36.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 12 Nov 2022 17:31:00 +0800 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.31; Sat, 12 Nov 2022 17:31:00 +0800 From: Yang Yingliang To: CC: Subject: [PATCH 1/2] pcmcia: ds: fix refcount leak in pcmcia_device_add() Date: Sat, 12 Nov 2022 17:29:23 +0800 Message-ID: <20221112092924.3608240-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: dggems702-chm.china.huawei.com (10.3.19.179) 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?1749282386620898036?= X-GMAIL-MSGID: =?utf-8?q?1749282386620898036?= If device_register() returns error, the refcount of function_config need be put. Fixes: 360b65b95bae ("[PATCH] pcmcia: make config_t independent, add reference counting") Signed-off-by: Yang Yingliang --- drivers/pcmcia/ds.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index ace133b9f7d4..7d3258a1f8f8 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c @@ -574,10 +574,12 @@ static struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, pcmcia_device_query(p_dev); if (device_register(&p_dev->dev)) - goto err_unreg; + goto err_put_ref; return p_dev; + err_put_ref: + kref_put(&p_dev->function_config->ref, pcmcia_release_function); err_unreg: mutex_lock(&s->ops_mutex); list_del(&p_dev->socket_device_list); From patchwork Sat Nov 12 09:29:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 19153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1192073wru; Sat, 12 Nov 2022 01:35:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf6dE+gyeNzfuI+NG2f/nYZzbXOJxKeE7/EUa5cS8aHvujFm8WWdwnS2r0Ixh1LaQASK24/m X-Received: by 2002:a17:906:492:b0:7ad:bb54:75d3 with SMTP id f18-20020a170906049200b007adbb5475d3mr4645310eja.484.1668245722922; Sat, 12 Nov 2022 01:35:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668245722; cv=none; d=google.com; s=arc-20160816; b=WBvLq2gBLux1m3G2wqPkY06UgvDAAE1MTPKu/1WH+P0ifv67nkU6mJvLsUVVIyBlEe RpXc3FOxY0jUmOQDK0239hBmjoxKtwVJ5Xg8q0dPDvM6y/GasFbtuOpIY5t2hl7nTTuV oXflhVVLXC2xllkP+EndhkKEThh9xnvWkchzAGt0Hw2hY6kZ/OwR8f5Bg35OPzb3tmT/ pNrppCgi30f922MvGiVPvMBKqCilSv8D33I4fCqdIs5GIprjHa7CRn3Ol2D/ZdT6NijW Uo9GHteyCYvoDryOXTzlnWYKbKR6DBsKMtQm+70eD9Pgq8n4vBC/OHxYofY19KjXok+Q K1vg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=k72F0fqq1oFu720D4mDCDgmRLR4bJdMJ9CK9MmOPCSg=; b=bMusJqfPhsiGaUlnbf73ZkLex0yzj2b0xEigapn8Z3uNSbaIFZKVpjKuveiRbb7MLD f8lIXHWiOBLWdq95r7+D4QPkJjUASUo8kCWcyNbsI89amudxx3D7Ql5Qxx313bda3irv cyQIfkBFdf2ScFvHBEk5oneKHOsYRgTpmdjosfmTTX4ujTzz7jAiGunn3vBFQNHbk1t+ y7Aw7H/lzI0G+JKRk9ZPZW5THvRosaTori2A34n8DvS2iLZ2VBi6ZvVoHDwsTx7xkHU7 L1fP0AMctMSMkdfsJIrmmx2AIP1l1qaYxfbR9/8l5piLQ5VUDd6A/n10sTki9k2Rk9n3 OM5g== 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 g12-20020aa7c58c000000b0045fb7a04ce0si3446034edq.148.2022.11.12.01.34.59; Sat, 12 Nov 2022 01:35:22 -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 S234781AbiKLJbH (ORCPT + 99 others); Sat, 12 Nov 2022 04:31:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234562AbiKLJbD (ORCPT ); Sat, 12 Nov 2022 04:31:03 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8314A14D1F for ; Sat, 12 Nov 2022 01:31:02 -0800 (PST) Received: from dggpemm500021.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N8Vg85Vfcz15MY3; Sat, 12 Nov 2022 17:30:44 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500021.china.huawei.com (7.185.36.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 12 Nov 2022 17:31:01 +0800 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.31; Sat, 12 Nov 2022 17:31:00 +0800 From: Yang Yingliang To: CC: Subject: [PATCH 2/2] pcmcia: ds: fix possible name leak in error path in pcmcia_device_add() Date: Sat, 12 Nov 2022 17:29:24 +0800 Message-ID: <20221112092924.3608240-2-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221112092924.3608240-1-yangyingliang@huawei.com> References: <20221112092924.3608240-1-yangyingliang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1749282426982571951?= X-GMAIL-MSGID: =?utf-8?q?1749282426982571951?= Afer commit 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array"), the name of device is allocated dynamically, it need bee freed. As comment of device_register() says, it should use put_device() to give up the reference in the error path, some resources is going to freed in pcmcia_release_dev(), so don't use error label, just return NULL after calling put_device(). Before device_initialize(), it can not call put_device(), so move the dev_set_name() before device_register(). Fixes: 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array") Signed-off-by: Yang Yingliang --- drivers/pcmcia/ds.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 7d3258a1f8f8..a249d9a0457b 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c @@ -513,9 +513,6 @@ static struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, /* by default don't allow DMA */ p_dev->dma_mask = 0; p_dev->dev.dma_mask = &p_dev->dma_mask; - dev_set_name(&p_dev->dev, "%d.%d", p_dev->socket->sock, p_dev->device_no); - if (!dev_name(&p_dev->dev)) - goto err_free; p_dev->devname = kasprintf(GFP_KERNEL, "pcmcia%s", dev_name(&p_dev->dev)); if (!p_dev->devname) goto err_free; @@ -573,8 +570,17 @@ static struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, pcmcia_device_query(p_dev); - if (device_register(&p_dev->dev)) + dev_set_name(&p_dev->dev, "%d.%d", p_dev->socket->sock, p_dev->device_no); + if (!dev_name(&p_dev->dev)) goto err_put_ref; + if (device_register(&p_dev->dev)) { + mutex_lock(&s->ops_mutex); + list_del(&p_dev->socket_device_list); + s->device_count--; + mutex_unlock(&s->ops_mutex); + put_device(&p_dev->dev); + return NULL; + } return p_dev;