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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 4A827C433DF for ; Mon, 8 Jun 2020 23:19:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 210672085B for ; Mon, 8 Jun 2020 23:19:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658359; bh=77u72D9VlTY2jBi0AkU5YU4MRynhJxSGo/d8y+n6pyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=e4oR21ZYoyxzLlh/WcZvecmAOIJfb1ZGtDF5audrfN5q0w7YjjOqdE5BIkd/PkJSs dMVDSxW0E6VEier8ZXnrlXMFwqO/1/svJx6y+GC7Ct4dEedXk9wlC8+FnM6vbqG8Tt Z1IR2LpihQWYhaGON5aveS94jhK95H+uztiHkYio= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730764AbgFHXTQ (ORCPT ); Mon, 8 Jun 2020 19:19:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:41950 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730748AbgFHXTN (ORCPT ); Mon, 8 Jun 2020 19:19:13 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9E19520870; Mon, 8 Jun 2020 23:19:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658353; bh=77u72D9VlTY2jBi0AkU5YU4MRynhJxSGo/d8y+n6pyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JS7MWay6iSoB4AdZcJ8uwXcPCx5CiB4+fagV6KJBf9fIu8svV/0g1qQq3DLfNKQg2 c06axhbgwfAjPUR0NkBWVQQ8PKVLFAC6aoOkJ5DtDCcv6k3kLlPi50Qp5/FkfOWYZ/ 2CU+fpAzTyPgR0BExJ39GIA3MSmitOx4dhcgjXSU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Starovoytov , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 020/175] net: atlantic: make hw_get_regs optional Date: Mon, 8 Jun 2020 19:16:13 -0400 Message-Id: <20200608231848.3366970-20-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608231848.3366970-1-sashal@kernel.org> References: <20200608231848.3366970-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mark Starovoytov [ Upstream commit d0f23741c202c685447050713907f3be39a985ee ] This patch fixes potential crash in case if hw_get_regs is NULL. Signed-off-by: Mark Starovoytov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index 12949f1ec1ea..145334fb18f4 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -690,6 +690,9 @@ int aq_nic_get_regs(struct aq_nic_s *self, struct ethtool_regs *regs, void *p) u32 *regs_buff = p; int err = 0; + if (unlikely(!self->aq_hw_ops->hw_get_regs)) + return -EOPNOTSUPP; + regs->version = 1; err = self->aq_hw_ops->hw_get_regs(self->aq_hw, @@ -704,6 +707,9 @@ int aq_nic_get_regs(struct aq_nic_s *self, struct ethtool_regs *regs, void *p) int aq_nic_get_regs_count(struct aq_nic_s *self) { + if (unlikely(!self->aq_hw_ops->hw_get_regs)) + return 0; + return self->aq_nic_cfg.aq_hw_caps->mac_regs_count; } -- 2.25.1