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,URIBL_BLOCKED,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 6B8F6C18E5B for ; Tue, 10 Mar 2020 13:08:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3688A2468D for ; Tue, 10 Mar 2020 13:08:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583845736; bh=jRiaA9a8UtSmP6Zw26VvM83HgoI1EXaTghJgaSfo4fM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NyeaZjEyopLqo4BHE48eTmJ0fdjcUlAvHVrgTkRtLjlOGQuEOYtkW0Omfl3yyrnFE uMLdkIvcToTWxPKE86o8gk+fvCMYfyi4ziZxtR1qDdYnz+afiYwzHfZYJRxjeMGioM lAlDvykbkwI+BDW7gO5QEmiGL7cEJjPJPTMsA+J4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730763AbgCJNIy (ORCPT ); Tue, 10 Mar 2020 09:08:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:55746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731175AbgCJNIy (ORCPT ); Tue, 10 Mar 2020 09:08:54 -0400 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 BD0E720409; Tue, 10 Mar 2020 13:08:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583845733; bh=jRiaA9a8UtSmP6Zw26VvM83HgoI1EXaTghJgaSfo4fM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tw42OyX5HfI4XdCwtQPJvhddklqH31pftBn7QX3HjqRk31W9sC+MzH3mo9pPdx3J7 ky25u5cdtgCd/zOXGz5BM9xe352Z3k5j0F8W4FQ853eajDUgIudVTKXu6rmiTrZ4ec lLXt026hZIm1IB6JpcLmErz1SNRaCbj/DAj7KCJM= 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.14 053/126] net: atlantic: fix potential error handling Date: Tue, 10 Mar 2020 13:41:14 +0100 Message-Id: <20200310124207.605511122@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310124203.704193207@linuxfoundation.org> References: <20200310124203.704193207@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 @@ -519,8 +519,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;