From patchwork Fri Mar 10 16:34:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 737457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vftD92g9Fz9s7y for ; Sat, 11 Mar 2017 03:35:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Yw8sDXdQ"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755363AbdCJQfb (ORCPT ); Fri, 10 Mar 2017 11:35:31 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35386 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933023AbdCJQfP (ORCPT ); Fri, 10 Mar 2017 11:35:15 -0500 Received: by mail-wm0-f67.google.com with SMTP id z63so3118953wmg.2; Fri, 10 Mar 2017 08:35:13 -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; bh=5ieWjHM9jNYnwMT6PfBcVsFzyvSwwdtpDPfA2dCqmuI=; b=Yw8sDXdQ0LTIKzZJi/UQm7qnWu/deH761osIjlJFeHfMNkPi3kKvsZqISDMbQl0uk3 7S93Cg/qePhSmXIYDF3O2l6sWXa/lmE93tvzvnjCFLW4mCYT5hcLyDLisRP73lNj/zlg xS2eG6f0MYCPczj4f89TXeG03KaxqhDbxu8UIrSh/q44KUBc0REkqXdgRhsMJH57ueGj LQnnpw7iPl45x/wrAfX63zfwfFfK2psxakH5IsYwhJlb0cXy/FpwsGIVxdbWEb60j4ST s/RvPmOknk+EFAXBOSgoXip2Vc03fNoFOGqCxCd1G1vZFE2006KIrdz7v+oYsXaPJj1p fdiw== 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; bh=5ieWjHM9jNYnwMT6PfBcVsFzyvSwwdtpDPfA2dCqmuI=; b=WW1CFAMblgnmYQSHTrRxiFMe+wOz3yxbtAOUcBs9a3e93BAXY/SP6zDv8BfsOS3DyY F74RXy4wIIDksphy/+U1aNEEpiVKofNUD5bQnQdKILObfzWGZza53zMgc0xOQcEYV8PN Vkjn0BRIZGYjO4Bk+lxQSs+4wAoR7L9gtaJxFxpiemvP2x2fYNrkEzvEPdDuIqm3TwbU lhlB7B/nvAD/im11CPokG/sBGFvpBAHs9VIvSaoZs88HxwXOYQpJZwsNPcplrQ/mzA3D G8U7fjOUsg0Otj3pLvM52gJH2Cc+MBCwmdvfOPhidJY1UA+1qdeUV8+1iNL9Mai1BW99 OHXg== X-Gm-Message-State: AFeK/H3Fh+UEOtWGi9Bb7MKLjmbvJQfDCNO9an2hcGZ7y7NHQ94KBzAx165yfflg3B0WEA== X-Received: by 10.28.55.3 with SMTP id e3mr3361838wma.141.1489163711985; Fri, 10 Mar 2017 08:35:11 -0800 (PST) Received: from localhost (port-55061.pppoe.wtnet.de. [46.59.215.197]) by smtp.gmail.com with ESMTPSA id c76sm4029174wme.23.2017.03.10.08.35.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2017 08:35:11 -0800 (PST) From: Thierry Reding To: "David S . Miller" Cc: Giuseppe Cavallaro , Alexandre Torgue , Joao Pinto , Jon Hunter , Mikko Perttunen , netdev@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/9] net: stmmac: Check for DMA mapping errors Date: Fri, 10 Mar 2017 17:34:57 +0100 Message-Id: <20170310163501.31811-6-thierry.reding@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170310163501.31811-1-thierry.reding@gmail.com> References: <20170310163501.31811-1-thierry.reding@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding When DMA mapping an SKB fragment, the mapping must be checked for errors, otherwise the DMA debug code will complain upon unmap. Signed-off-by: Thierry Reding --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index ce6d7e791f3f..eba9088e1f61 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2079,6 +2079,8 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) des = skb_frag_dma_map(priv->device, frag, 0, skb_frag_size(frag), DMA_TO_DEVICE); + if (dma_mapping_error(priv->device, des)) + goto dma_map_err; stmmac_tso_allocator(priv, des, skb_frag_size(frag), (i == nfrags - 1));