From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 DB0C3C43381 for ; Wed, 17 Mar 2021 01:02:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B834464FAB for ; Wed, 17 Mar 2021 01:02:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232456AbhCQBAR (ORCPT ); Tue, 16 Mar 2021 21:00:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:36348 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231690AbhCQA6k (ORCPT ); Tue, 16 Mar 2021 20:58:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 02D3064FE6; Wed, 17 Mar 2021 00:58:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615942707; bh=Fki+6t2i693xmHEl2L3+HBbS1O+MLL5WTpNnEgLEha8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dD9TNMjC3uTD/S6uSAgeWpkF6XkAIIMhufnttZL2Uw9VE/f9jLMwA3XIZvMMkITwY fd2iKkcbJUZwVI4e01Aw3dd/ImUBjhw3Jeyu4XKnTLgCWgx0te2cLJhRiT7PJTjMqm V9mD50FO6pDC678A8MlCIATPo5Zx2YOFe/hhM59p0zZxc3sS9Q7RieT3X4MBPXPQ8H aSoXuOf7jjm7Hpf3N9ABPqExTFgyR/hR+btdFSQeClmH5EOdvN/gJilV4iZl+HiEtL m8T93O411dQhipCvOQ/LsTRX1rGzkqZS2gap6kFnukclfOlzctuhVbhKYC5bV5JNIw HHl/Gvcfa4O8Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tong Zhang , "David S . Miller" , Sasha Levin , linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 20/37] atm: uPD98402: fix incorrect allocation Date: Tue, 16 Mar 2021 20:57:45 -0400 Message-Id: <20210317005802.725825-20-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210317005802.725825-1-sashal@kernel.org> References: <20210317005802.725825-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tong Zhang [ Upstream commit 3153724fc084d8ef640c611f269ddfb576d1dcb1 ] 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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)); -- 2.30.1