From patchwork Mon Mar 13 06:58:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 68641 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1041130wrd; Mon, 13 Mar 2023 00:15:09 -0700 (PDT) X-Google-Smtp-Source: AK7set8xHGWkwE/MqrqS4EQuaOxmawiesc9AAILpx6mpm4V6oPY/Nzp/mPCqKoZ/pS1gRzCw3EPR X-Received: by 2002:a17:902:d50a:b0:1a0:5652:6168 with SMTP id b10-20020a170902d50a00b001a056526168mr465257plg.58.1678691709082; Mon, 13 Mar 2023 00:15:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678691709; cv=none; d=google.com; s=arc-20160816; b=MiABnpl+7YRAXWEAXAdcyRiMt0tCqAGjZIkoWNNThSL1z59QFX3MOnpRs9G2Y9GhQ8 DbMfK5WwOMl39/PB3tjmGwaD3F3Hj6fGPapY9gUo+5avqqspcSgd+Ioj6QvbwRGhWpCR zxVDH4NeyVvmYJGNW0tXSFSY4ojK096BWvxEuSOy8ztLkSw2/KIQKEr2QDvBf64SFWEw HCchCifSHe8+17bU/jaN7Km1z/xuIXSABtuL9VHR5dx7rfHozia42pnQ0zUVHEPnIExF xAHe8lEMTk4luGsUFj4qdHSFS3LVp8dt9H/nDFmFcFtE6hRqFgD8Nymy5MDzZZzwZmWw 8Dkg== 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=1Ca5EX6hVOmiHztL8eQDvx3c76OSpJCJcaAPk2hP6Rw=; b=VHRSxJoD3ueZ54V3Lr4b3+W5Yl1GTw+tPzSX4WIAQxBmtN3DPhnoAYCQzJox7qZ0WK tBQPktcRFlRn2KNWXmv6y/JWsyEHdvnZ/O5ol4xBuQBEij5BBD+GHw66FnXBze8nJFOb KuL57Y2TjSZjLNTiusRUolFUT0X3Lx6slZY5DM5rKtDU+Me3/m89CWxh4+NFa6gFGpPs oESlBPFO1jTizzrqtmjV0qT2IvULXw4JNEvKIOKitisZgS5On620THyZ7IZB/rn456rZ oNpp5snOQFgfZVTrOelJTHR2eqh5XwA89j59V8Fo3JMzvbpjbRt6Y+QqQyw14wu1oaSw wLAQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p17-20020a170902e75100b0017a0e7aaf6bsi5548944plf.128.2023.03.13.00.14.54; Mon, 13 Mar 2023 00:15:09 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229838AbjCMHB4 (ORCPT + 99 others); Mon, 13 Mar 2023 03:01:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229768AbjCMHBx (ORCPT ); Mon, 13 Mar 2023 03:01:53 -0400 Received: from hust.edu.cn (unknown [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56AED302A4; Mon, 13 Mar 2023 00:01:52 -0700 (PDT) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 32D7107A005037-32D7107D005037 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 13 Mar 2023 15:01:05 +0800 From: Dongliang Mu To: Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Dongliang Mu , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] wifi: ray_cs: remove one redundant del_timer Date: Mon, 13 Mar 2023 14:58:22 +0800 Message-Id: <20230313065823.256731-1-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, 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?1760235837797739179?= X-GMAIL-MSGID: =?utf-8?q?1760235837797739179?= In ray_detach, it and its child function ray_release both call del_timer(_sync) on the same timer. Fix this by removing the del_timer_sync in the ray_detach, and revising the del_timer to del_timer_sync. Signed-off-by: Dongliang Mu --- drivers/net/wireless/ray_cs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 1f57a0055bbd..785a5be72b2b 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -331,9 +331,6 @@ static void ray_detach(struct pcmcia_device *link) ray_release(link); - local = netdev_priv(dev); - del_timer_sync(&local->timer); - if (link->priv) { unregister_netdev(dev); free_netdev(dev); @@ -734,7 +731,7 @@ static void ray_release(struct pcmcia_device *link) dev_dbg(&link->dev, "ray_release\n"); - del_timer(&local->timer); + del_timer_sync(&local->timer); iounmap(local->sram); iounmap(local->rmem); From patchwork Mon Mar 13 06:58:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 68650 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1048515wrd; Mon, 13 Mar 2023 00:38:54 -0700 (PDT) X-Google-Smtp-Source: AK7set/WoCp5KQ7JsAsnnjva+1L9UwAMmncGtP7+hWDEWS3CR/7/dgM7UljCEPEJgwwQNLUUkZvB X-Received: by 2002:a62:1d0b:0:b0:5df:421d:1962 with SMTP id d11-20020a621d0b000000b005df421d1962mr23426356pfd.2.1678693134429; Mon, 13 Mar 2023 00:38:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678693134; cv=none; d=google.com; s=arc-20160816; b=racjxj4bkhG4QVYhQVsXEcp/CSKgfZmFlxthQl8BtzEbxg75EIzZhc5f4PG5S5Lh3J oAWomq/WpXmG4I6r5zmn7PubkmI31g4bjrxYE2CzmOifW/lw6pcfRQIbad/9kBiW9zbk agaPOFAqfJkIKLn35GE4ZYD7kX8V40FBNUnvctfwQYEtZSYplPWr+qwtLJnS6IaMYZaX QCtil/mYIfa4A3Hhx10R79rGf6H1qCMFmeo0Dp/t7zy/P+9Q8e9llCkcj1ZF47cxNKWI BerbS1LCd8WwjIcfWqL4Up4mFEzBn0lZLLBoLwOkD1fxKSM3yy7nJnaqjgyov+TrO3m/ KKtA== 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=gnOWgZEKaBWH/3wLI30Q4JzH4FTSssY2esI7yV2EbrQ=; b=TdWBGgrYTqTkIiTlHKgdZI4BOcRi8AGxrMvaX6xc8MuXbjHalTdrNuwUNb51PMB/Z3 Kcvn5Mto+/CZnoizfZN2wdg66cExQRcofG00P6LBr51nAiFAFNzFhFaDGhxzXXY5pe3K N6VZDyyOjJ8mcxP0VXIWesxslzd/z91aUBsuQcNCdP7y4DcipNE08DdWP77BRZdVzSWT dsKAxUoVRll/OWcGgoOdZzZkrF3fqAZGei645zsn3J0o8zdJs4k9ippGOayASOG+xkTc 2SycW5SPvh4FTRaVPWUpj6tHMWH0XRlBYd02zZDJi54KqqwtPSBJozRr4RYZlnBs7pR0 D0eQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 5-20020a620505000000b005a908acf445si5732260pff.101.2023.03.13.00.38.42; Mon, 13 Mar 2023 00:38:54 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229745AbjCMHBw (ORCPT + 99 others); Mon, 13 Mar 2023 03:01:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229553AbjCMHBu (ORCPT ); Mon, 13 Mar 2023 03:01:50 -0400 Received: from hust.edu.cn (mail.hust.edu.cn [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 298F7305EE; Mon, 13 Mar 2023 00:01:48 -0700 (PDT) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 32D7107A005037-32D7107E005037 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 13 Mar 2023 15:01:07 +0800 From: Dongliang Mu To: Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Dongliang Mu , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] wifi: ray_cs: add sanity check on local->sram/rmem/amem Date: Mon, 13 Mar 2023 14:58:23 +0800 Message-Id: <20230313065823.256731-2-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313065823.256731-1-dzm91@hust.edu.cn> References: <20230313065823.256731-1-dzm91@hust.edu.cn> MIME-Version: 1.0 X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, 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?1760237332420327848?= X-GMAIL-MSGID: =?utf-8?q?1760237332420327848?= The ray_config uses ray_release as its unified error handling function. However, it does not know if local->sram/rmem/amem succeeds or not. Fix this by adding sanity check on local->sram/rmem/amem in the ray_relase. Signed-off-by: Dongliang Mu --- drivers/net/wireless/ray_cs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 785a5be72b2b..47d9c71b63b5 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -733,9 +733,12 @@ static void ray_release(struct pcmcia_device *link) del_timer_sync(&local->timer); - iounmap(local->sram); - iounmap(local->rmem); - iounmap(local->amem); + if (local->sram) + iounmap(local->sram); + if (local->rmem) + iounmap(local->rmem); + if (local->amem) + iounmap(local->amem); pcmcia_disable_device(link); dev_dbg(&link->dev, "ray_release ending\n");