From patchwork Mon Mar 8 03:25:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tong Zhang X-Patchwork-Id: 396574 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F07B1C433E6 for ; Mon, 8 Mar 2021 03:28:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB01465159 for ; Mon, 8 Mar 2021 03:28:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233913AbhCHD0e (ORCPT ); Sun, 7 Mar 2021 22:26:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230410AbhCHD0E (ORCPT ); Sun, 7 Mar 2021 22:26:04 -0500 Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8842C06174A; Sun, 7 Mar 2021 19:26:03 -0800 (PST) Received: by mail-qt1-x82b.google.com with SMTP id h26so2209679qtm.5; Sun, 07 Mar 2021 19:26:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LziXrTIHxhFuAQv8fGFAIOjkYK0Uv1eKpTDXXFAhzj4=; b=oQnwL3XtyAv+xV0Nocjhh6j9yrhuVZ+y+TPYh/64X7nbxEI47o/yi40iDLHmRxTAOT t7bM06GTAMNjz6s7ut1QhyoaAnkfTVuog1e+/z1b4aEhBSkL2Oqv/vRqM80qfTZ5AEie BnzoemEUFuAqquw/bm6alTP7CHF2E9110aAJ/hAMTHP2/FQpFFMQiawlkSMDtynmfk7/ qwJ5+Zetkr9gAP0WGx7PCgbMszHjUJb5BhptihLC8NTYMU5ZlQxhT0kIgCFd9Gsxloy1 A+BipMHAmlRQJIFzV5f/EAllo+wpqPBMSYznDInrQAAHJi3BLTqUvyo2/Yf+iPcjD5cf nkaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LziXrTIHxhFuAQv8fGFAIOjkYK0Uv1eKpTDXXFAhzj4=; b=L6dxuO3fjCJ38jPQCDk4rBcG8VV2rbyR0gBCgztRvZ/3cEFbbKxxpeBnRWnMGctiAF gaEtQWkULmdpMVQ3V9aEJ3JexjBA/k6ppiEj3+Zk+O5ThYCSxssskwvORz8F35UHuIHy EfB0q4qAVJhTmBh+H/F/ZxYQxpWawAdDuAzZyBMDjmIHqfBwFBAg3BVjvNzHkYkgIWAj U7IoDES7CxAC0a2Sg7eMe6UH1HVo+n9rgUQE7IX4jSg0QgYNLbalCO0qUa0fkVZGOmXV VJGHgr81zMCrVa0aKNjWW9O+5ojTD5diGrjP2EPg4aLDgaFVj0WKf7UzOdfK3WjEs2W7 deyA== X-Gm-Message-State: AOAM530YeqR7W2NoUyNZ/wi7YvilRB8hw7Ei5to0bYbBigtbD23ZXjT/ tCTIX9V0zcPnmZnTptGUGRk= X-Google-Smtp-Source: ABdhPJwxdQHRDuyKR8jdsZVJ9ZEESG4YJBnPBGUGBDoChfowFcC5XsIcEe2JYwJ7R9cqP8pwsMIoHQ== X-Received: by 2002:ac8:1301:: with SMTP id e1mr10286963qtj.96.1615173963233; Sun, 07 Mar 2021 19:26:03 -0800 (PST) Received: from tong-desktop.local ([2601:5c0:c200:27c6:99a3:37aa:84df:4276]) by smtp.googlemail.com with ESMTPSA id r7sm339725qtm.88.2021.03.07.19.26.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 19:26:02 -0800 (PST) From: Tong Zhang To: Chas Williams <3chas3@gmail.com>, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ztong0001@gmail.com Subject: [PATCH 1/3] atm: fix a typo in the struct description Date: Sun, 7 Mar 2021 22:25:28 -0500 Message-Id: <20210308032529.435224-2-ztong0001@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308032529.435224-1-ztong0001@gmail.com> References: <20210308032529.435224-1-ztong0001@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org phy_data means private PHY data not date Signed-off-by: Tong Zhang --- include/linux/atmdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index 60cd25c0461b..9b02961d65ee 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h @@ -151,7 +151,7 @@ struct atm_dev { const char *type; /* device type name */ int number; /* device index */ void *dev_data; /* per-device data */ - void *phy_data; /* private PHY date */ + void *phy_data; /* private PHY data */ unsigned long flags; /* device flags (ATM_DF_*) */ struct list_head local; /* local ATM addresses */ struct list_head lecs; /* LECS ATM addresses learned via ILMI */ From patchwork Mon Mar 8 03:25:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tong Zhang X-Patchwork-Id: 396573 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4ABEEC43381 for ; Mon, 8 Mar 2021 03:28:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E7D165159 for ; Mon, 8 Mar 2021 03:28:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233931AbhCHD0g (ORCPT ); Sun, 7 Mar 2021 22:26:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233829AbhCHD0R (ORCPT ); Sun, 7 Mar 2021 22:26:17 -0500 Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5ADDFC06174A; Sun, 7 Mar 2021 19:26:06 -0800 (PST) Received: by mail-qk1-x732.google.com with SMTP id f124so8055727qkj.5; Sun, 07 Mar 2021 19:26:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1CJsuQH6dNuHiZ5PJsDIdikWw3G3ly1EQuliBwvuFzM=; b=XxKEflz+cBCh0OVj3nYj/i5GexNaAsuHwxPgiL9rYF3wREiNeC3YHIlUrNs/Lpj9c/ 7Hz/79JfR5hLZ4ZDJ12nm8hpgc6RFfBMxTqTZrvxY/TSIEnZsASresqWzRof9Kn3PIUg d2z1Cgk7JXJLNtuUw+um7rWa5Yc7KUJUKCyi4umfWNaTUi+VFsOgspwvGK8zxZwhJ4im nc4f7CG9GCeg3AllMzE+ASRo68EWwy9to6Hv2yCmRNyfE0L7Rh6B9EY+X6FFDwr7Smja 3OP4VKsT0SaR0/XEc8vazuotiMM/Re+oyiW91SlIViFrcVugsgZNWSW+Qlanric8G6vN F/YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1CJsuQH6dNuHiZ5PJsDIdikWw3G3ly1EQuliBwvuFzM=; b=rVRU3jm509hH8vy3utQSB70NU/vGFQRQAmkT53TofZAIdIwwltFpTPdrt9y+E/wR3C tligupIl30gwT4jU44ZM6LpV2cZGhEY6xdOOl7O0bEGj3VHVsFDx1aIrBhu3KWx+a6NX 65K6Eom9KYV3XUtJO5CSPr8pIN2DXy6bPxK9lsDLGY5YuX7ZB+Q8bV4LYncfkDfnv3n4 6u/8piXYybLJfCrVIwYLjf/1MsL+hMUDllnJb1/Q5x5SE4mENIi379BMfW3RQ7G1MEeM 54nNVYW/fHkcuoQCBDn+AFbN4qEN36lBgn/OO50r8b8Z4/ysRRUIcUR9PLMB216GuZcA i53g== X-Gm-Message-State: AOAM530TpFGT+H0kbLVfr+QyY9HL8mlTiLUW/VANP6HseJDrFPnDX6iX pbohUgSK7hZ2bL8Vx2xy8xsXBaIk+5T+jA== X-Google-Smtp-Source: ABdhPJwNruETUKCni9TMKHQ6WieNN6NBfWJiU8i3CfS7+39NGdA9eof94jRFXEAfJFQySXVLA4rfgA== X-Received: by 2002:a37:6294:: with SMTP id w142mr12550334qkb.255.1615173965592; Sun, 07 Mar 2021 19:26:05 -0800 (PST) Received: from tong-desktop.local ([2601:5c0:c200:27c6:99a3:37aa:84df:4276]) by smtp.googlemail.com with ESMTPSA id r7sm339725qtm.88.2021.03.07.19.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 19:26:05 -0800 (PST) From: Tong Zhang To: Chas Williams <3chas3@gmail.com>, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ztong0001@gmail.com Subject: [PATCH 2/3] atm: uPD98402: fix incorrect allocation Date: Sun, 7 Mar 2021 22:25:29 -0500 Message-Id: <20210308032529.435224-3-ztong0001@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308032529.435224-1-ztong0001@gmail.com> References: <20210308032529.435224-1-ztong0001@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org dev->dev_data is set in zatm.c, calling zatm_start() will overwrite this dev->dev_data in uPD98402_start() and a subsequent PRIV(dev)->lock (i.e dev->phy_data->lock) will result in a null-ptr-dereference. I believe this is a typo and what it actually want to do is to allocate phy_data instead of dev_data. Signed-off-by: Tong Zhang --- drivers/atm/uPD98402.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c index 7850758b5bb8..239852d85558 100644 --- a/drivers/atm/uPD98402.c +++ b/drivers/atm/uPD98402.c @@ -211,7 +211,7 @@ static void uPD98402_int(struct atm_dev *dev) static int uPD98402_start(struct atm_dev *dev) { DPRINTK("phy_start\n"); - if (!(dev->dev_data = kmalloc(sizeof(struct uPD98402_priv),GFP_KERNEL))) + if (!(dev->phy_data = kmalloc(sizeof(struct uPD98402_priv),GFP_KERNEL))) return -ENOMEM; spin_lock_init(&PRIV(dev)->lock); memset(&PRIV(dev)->sonet_stats,0,sizeof(struct k_sonet_stats)); From patchwork Mon Mar 8 03:25:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tong Zhang X-Patchwork-Id: 395848 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28245C433E9 for ; Mon, 8 Mar 2021 03:28:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F118B65177 for ; Mon, 8 Mar 2021 03:28:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233919AbhCHD0f (ORCPT ); Sun, 7 Mar 2021 22:26:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233805AbhCHD0I (ORCPT ); Sun, 7 Mar 2021 22:26:08 -0500 Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4592CC06175F; Sun, 7 Mar 2021 19:26:08 -0800 (PST) Received: by mail-qk1-x735.google.com with SMTP id f124so8055764qkj.5; Sun, 07 Mar 2021 19:26:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b3gaboiJgJIOoDpDuaORkzc0Km12UiNYnqNRebiTimg=; b=QG5aVISxQMHCusIBbqG/1x4/jf8PSgsix23YCvIMCYdJaI9Jg4x4S9Fb88c4+VP/Z0 i5bK15x4sYmR/uGt0yYlRfrwo0evDmXwMn7u+4SnqfTX5jPsRDqHr1tgI+eoSeHk4vJq ypojmqOgGp7mLg4aJkvKQAiRDe8Uru3HkgYZGkADARI1OhnUTRdX1bnouH2YW2XgWtLT XgmfOohZcIkJ3r0xFfwkRZaWd/uk3qrNe0Rt7dFOPp9qwWtNn3oljSRs1UgZInEcbNom cCVraN81wrXMlVlUP28RhB0RhosE74bktTrFqIu0avC889ub45XnQAtQzDqXytsUuGjp RbSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b3gaboiJgJIOoDpDuaORkzc0Km12UiNYnqNRebiTimg=; b=NmHeLFImQyf2RRMPszAIostEs1uY4MrcawaKx6is9LskC2SABfiy3pY5SrVZxFT0yw 0sU/wWG8jkmz5x8uo4xQPt/QwDndjElCiirGuNt9dk4KHcMbL86oMM2k7wSX9e7m1TZq 6S6e52zffhkTvvVucW04w47p4Ug1nod6YEp/D0Ik/KrWWC3fysbtX8QbYXeYlu6RQfM8 k4wsQSlToV7tnsX8Qz7I7T4p38bOCwMX08eLasNpdzemhEfu8qhioWq07Et5H2MNqMLU hy1wdCb7Pnn5yTmF4HMuCX26xpqf9tw8HOaXpGWSAaIq6u22JhFazjIVt8P7Z5/zib+k +4zA== X-Gm-Message-State: AOAM53380xgc1pPIO39DnoDBJ4cKXoe5RwabiKfYlMP1V8FTXL8IdedD WCF8M/4k4b1CQsXq7x0zWGw= X-Google-Smtp-Source: ABdhPJxqaxYFTley5OKVU2kFe1XuBDh0wLvDDLkSokpsCAbW7ZNyWFvf2EyrICy7H1SPrKxg5/Y0Fw== X-Received: by 2002:a37:30f:: with SMTP id 15mr19271390qkd.494.1615173967447; Sun, 07 Mar 2021 19:26:07 -0800 (PST) Received: from tong-desktop.local ([2601:5c0:c200:27c6:99a3:37aa:84df:4276]) by smtp.googlemail.com with ESMTPSA id r7sm339725qtm.88.2021.03.07.19.26.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 19:26:07 -0800 (PST) From: Tong Zhang To: Chas Williams <3chas3@gmail.com>, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ztong0001@gmail.com Subject: [PATCH 3/3] atm: idt77252: fix null-ptr-dereference Date: Sun, 7 Mar 2021 22:25:30 -0500 Message-Id: <20210308032529.435224-4-ztong0001@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308032529.435224-1-ztong0001@gmail.com> References: <20210308032529.435224-1-ztong0001@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org this one is similar to the phy_data allocation fix in uPD98402, the driver allocate the idt77105_priv and store to dev_data but later dereference using dev->dev_data, which will cause null-ptr-dereference. fix this issue by changing dev_data to phy_data so that PRIV(dev) can work correctly. Signed-off-by: Tong Zhang --- drivers/atm/idt77105.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c index 3c081b6171a8..bfca7b8a6f31 100644 --- a/drivers/atm/idt77105.c +++ b/drivers/atm/idt77105.c @@ -262,7 +262,7 @@ static int idt77105_start(struct atm_dev *dev) { unsigned long flags; - if (!(dev->dev_data = kmalloc(sizeof(struct idt77105_priv),GFP_KERNEL))) + if (!(dev->phy_data = kmalloc(sizeof(struct idt77105_priv),GFP_KERNEL))) return -ENOMEM; PRIV(dev)->dev = dev; spin_lock_irqsave(&idt77105_priv_lock, flags); @@ -337,7 +337,7 @@ static int idt77105_stop(struct atm_dev *dev) else idt77105_all = walk->next; dev->phy = NULL; - dev->dev_data = NULL; + dev->phy_data = NULL; kfree(walk); break; }