From patchwork Thu Mar 16 13:32:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 70795 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp488950wrt; Thu, 16 Mar 2023 06:42:17 -0700 (PDT) X-Google-Smtp-Source: AK7set9syp6UYZzME3PKgE4Qi4sJOiHN7odDNcxpimxeSUmXmevZuuiwsKk44vstnLnKhENBxOLJ X-Received: by 2002:a17:90b:3b90:b0:233:ebd4:301c with SMTP id pc16-20020a17090b3b9000b00233ebd4301cmr4234990pjb.1.1678974136974; Thu, 16 Mar 2023 06:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678974136; cv=none; d=google.com; s=arc-20160816; b=ExKZRXWbB5Ue6OANkBZK2/muoARAk84FnhnAsSqZBXPpbROlJZebDc86LEuZHTFJ3F 1pJ3FZc2EfEtJ/ugfEeswSADMPC1tyWpGy6IkUjN3PxJm216yd6qypvzeqblimzazuNK jZTQO/WbacMz+ZyQIE/ziNSmCbfovZ11SVy9u5iq8MSnlZJRwUwEXOHRJMocHDvixPBM XVGxJRO43GrH2glBBKyakSfMyBfPhN4KCMmreBoCGgVIANEKB4pUCeeo8ykB/YvAs5wW BgYirETpwZ6L16eZ1WZjKoEls07mT77HIx4tWy/Vo/94KunGCKLt9nO9tVnCy2LFSdao 42/g== 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=OsXmzn313INstclkOOBKRHM0D1oaqwBmXxGKG7hBVEQ=; b=QH0cDVD80bCrQ5XXdsvWJscX1SUa2ZWDHP4uUBeqjoWo4Op+p6NoW4E0w4MEDwx/Cs UboTDj7tecdQqoMihmObWC1rZALoMdqQ2BdJQyoXplmfV7IzVd3FRR7w9lq1ym7SXfZE /EGBWu4BYQXCK3/BYuaA4+hpElr2K85MrJZB5z9SbX+Qu2AbZRjFeE+hQK0OTggvdZR2 mpQ8VtBO0853apo9V6rZkAfKYiXyHvuxxAtIj8QKLJ7JAUv17Pt3JC0G5zC7BddAe1Bv KbsJZaPhrO4CHkYeqeUFfY4q8MK4GL9UB64vQZvQSoa6SXl7KoDq3EpJ2v1Wi3WBVa48 eKWg== 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 g5-20020a17090a9b8500b0023761783876si4754397pjp.103.2023.03.16.06.42.01; Thu, 16 Mar 2023 06:42:16 -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 S230093AbjCPNhq (ORCPT + 99 others); Thu, 16 Mar 2023 09:37:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230385AbjCPNho (ORCPT ); Thu, 16 Mar 2023 09:37:44 -0400 Received: from hust.edu.cn (mail.hust.edu.cn [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B34A597FDE; Thu, 16 Mar 2023 06:37:22 -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 32GDZEVW013709-32GDZEVa013709 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 16 Mar 2023 21:35:20 +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 v2 1/2] wifi: ray_cs: remove one redundant del_timer Date: Thu, 16 Mar 2023 21:32:35 +0800 Message-Id: <20230316133236.556198-2-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230316133236.556198-1-dzm91@hust.edu.cn> References: <20230316133236.556198-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?1760531984984747075?= X-GMAIL-MSGID: =?utf-8?q?1760531984984747075?= 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 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 1f57a0055bbd..ce7911137014 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -322,7 +322,6 @@ static int ray_probe(struct pcmcia_device *p_dev) static void ray_detach(struct pcmcia_device *link) { struct net_device *dev; - ray_dev_t *local; dev_dbg(&link->dev, "ray_detach\n"); @@ -331,9 +330,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 +730,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 Thu Mar 16 13:32:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 70797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp491120wrt; Thu, 16 Mar 2023 06:46:57 -0700 (PDT) X-Google-Smtp-Source: AK7set/C8CjDXS8vVwoquOymw8peHnJn3XL6vEMBRI6xTguVajBqEiAkBhz+CYkR149v60sP25cB X-Received: by 2002:a05:6870:ac0f:b0:17a:d2e0:1a14 with SMTP id kw15-20020a056870ac0f00b0017ad2e01a14mr3900745oab.27.1678974417027; Thu, 16 Mar 2023 06:46:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678974417; cv=none; d=google.com; s=arc-20160816; b=X6bTd9x5Uoq9LWrAya6AIsjC0m1pDhUk4RIJIKOPE3UXS/FxK8DXy7BMes08XE/VKy 0/hJ6h8KqoLw8+gtOx04/lLKgl0wjt20PT1Mou0mb8lPdu3HYsJEOK1YSJ6irTs3oaRe rNqzO4Mb1GHiyftR32fTqQigfqz8cql88nLqQBZIq8GK3aNvn7xTgu1CBOx8MiizRJfR It9lgV77AvX6bO8RlRpRQI0F6OJ1u66VlZ0k9c3uCgBqUCLBw4TXPu4sqHXE0eyoPIWq SQDRlR9hhzLkOuQs0MiSLz0pip/FCC8+MSecd+a7jXaJq38dP3zld/I+tsjXW9XnizbR oRZg== 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=K35P87C9VpMM5530dmeoYZqwvC1xRdPj7HQlY1AzRSM=; b=EQm3JdURsxyXpzGr4R0Nr48pDZFeFXseHt/AA82nB7rdi+unR0EIe8gwvXB4u7Oi9g KqexrjbMz9xYeXD2Ixokr+YpfL6r2xe7Fc64oRkpW5Mhx3lLlis5R8BLIQIl6X2l5m2A /mXdH4S1wWpNGuxyrGyzCstsGsL5lDbKGwGpHuQlNlIwlXKJ368CMj7FBZC84yOF+Ts7 JXPm+6LSaCAE3eV9ZQ7+ucv7QtqpBAJfRn3hukIOyVM3Yi8G5OV4dEIUWu/Ter35Xnrg PDiyXzGg155F4gysQw6nX2WNziG3aGml+0H8KLf4TNM6IQMQeXermmos/o+bbrtvdpjV YJBQ== 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 w5-20020a056870338500b001762ef4e20bsi7610326oae.258.2023.03.16.06.46.43; Thu, 16 Mar 2023 06:46:57 -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 S230394AbjCPNgL (ORCPT + 99 others); Thu, 16 Mar 2023 09:36:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229506AbjCPNgH (ORCPT ); Thu, 16 Mar 2023 09:36:07 -0400 Received: from hust.edu.cn (mail.hust.edu.cn [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C127A8EA37; Thu, 16 Mar 2023 06:36:01 -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 32GDZEVW013709-32GDZEVb013709 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 16 Mar 2023 21:35:22 +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 v2 2/2] wifi: ray_cs: add sanity check on local->sram/rmem/amem Date: Thu, 16 Mar 2023 21:32:36 +0800 Message-Id: <20230316133236.556198-3-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230316133236.556198-1-dzm91@hust.edu.cn> References: <20230316133236.556198-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?1760532278305003656?= X-GMAIL-MSGID: =?utf-8?q?1760532278305003656?= 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 ce7911137014..808b37352f39 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -732,9 +732,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");