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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 AD8BFC3F2D7 for ; Tue, 3 Mar 2020 18:01:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C83920CC7 for ; Tue, 3 Mar 2020 18:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258483; bh=qVx15RFKk4PNvGJ/mLn44ftM9J4PGdu5vcJo9CUXlkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ibtBevOXuuutfqKDfQK/SY0ctN6m1l6qOgbXKHfzfd2pRjjfAx7lKVm8AeysIiVDz 32Dmx1ck9zwDHs+DgiRqnFiO+2f2TTvB/1q6HWw5LvdP3kOq/cj/+a6ByhkjQi/f0P 3Lh96X7lfg7IwFSa1G7+alMnsxwQ8FjlD0S/v7NY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387959AbgCCSBX (ORCPT ); Tue, 3 Mar 2020 13:01:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:45446 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387627AbgCCSBW (ORCPT ); Tue, 3 Mar 2020 13:01:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 339A42072D; Tue, 3 Mar 2020 18:01:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258481; bh=qVx15RFKk4PNvGJ/mLn44ftM9J4PGdu5vcJo9CUXlkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PPz0ia5Q839z0KJk1hBP2WM7CHtb4qPvvYG6eMyPT1gWOPZ8QlY9nl3pnB6U2kR62 AD2q9iUkdxM6DH2mDleafxMIKX6342oGW4tJ2UIxQ6TqXe7nxa4uYEdmlY/MW0wVMU +L7/2C7tuiBPFnuQgX/ed4wjGysqF9uZlzSAE85g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Belous , Igor Russkikh , Dmitry Bogdanov , "David S. Miller" Subject: [PATCH 4.19 64/87] net: atlantic: fix potential error handling Date: Tue, 3 Mar 2020 18:43:55 +0100 Message-Id: <20200303174356.086143384@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174349.075101355@linuxfoundation.org> References: <20200303174349.075101355@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pavel Belous commit 380ec5b9af7f0d57dbf6ac067fd9f33cff2fef71 upstream. Code inspection found that in case of mapping error we do return current 'ret' value. But beside error, it is used to count number of descriptors allocated for the packet. In that case map_skb function could return '1'. Changing it to return zero (number of mapped descriptors for skb) Fixes: 018423e90bee ("net: ethernet: aquantia: Add ring support code") Signed-off-by: Pavel Belous Signed-off-by: Igor Russkikh Signed-off-by: Dmitry Bogdanov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -399,8 +399,10 @@ static unsigned int aq_nic_map_skb(struc dx_buff->len, DMA_TO_DEVICE); - if (unlikely(dma_mapping_error(aq_nic_get_dev(self), dx_buff->pa))) + if (unlikely(dma_mapping_error(aq_nic_get_dev(self), dx_buff->pa))) { + ret = 0; goto exit; + } first = dx_buff; dx_buff->len_pkt = skb->len;