From patchwork Thu Feb 23 17:24:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 731637 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vTh4t0vbrz9s7C for ; Fri, 24 Feb 2017 04:27:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cqKGS28L"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751700AbdBWR0D (ORCPT ); Thu, 23 Feb 2017 12:26:03 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:32921 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751169AbdBWRZA (ORCPT ); Thu, 23 Feb 2017 12:25:00 -0500 Received: by mail-wr0-f196.google.com with SMTP id s27so4650617wrb.0; Thu, 23 Feb 2017 09:24:47 -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=AewinyBPfP9iJiZicy5WjeyfDie5tUdvnfYlRFjn66k=; b=cqKGS28LZVA/9gqqV466IC3ys1prc06B3PBZkUKeeUjjvm7yKNnMfgwKVvl93rAA1a RGjpTQjQ0ou63fPkB7OfFmyC/slriZ9axHODeE61ppnfa4XbTM/YCGehA2coadzh10sx D5SDtCCXmb6EBgDZuVtk60tF4C6+LK1J239gGAcZZ0JuMpPWcTfhgOQxTTE1LB+3lkDa +77SelYetSVT/niamEPkIU0ATlujqEfd43wKzZIgj33GBcNIPR9za7h1RHGSF5WEaAO/ VRjviCSQfvg8XnkBMFNw98ZMbtzelBV6qxMRkYfeCEF9w8Xq4jMvNPmZQNdvyAhnaaxJ DSUA== 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=AewinyBPfP9iJiZicy5WjeyfDie5tUdvnfYlRFjn66k=; b=ZsdJ797zGPgQgnaoCSoaTjBZH0ERV8HuspBjDeuKn7iWKW/UyT6AU9vugb4X2QZ3pU n2hGjcXg7Sigft4sZo17ZahesJIf1XiZ7qvkWAaYuEWZbV9AGNUvfHXfX6CJxrxwftI9 K+pwWyBVpCSxcGfH8OFI13R5hP1IQtRbTuckhezmQ8lBhVc2w+UD1jZk8F9nRzxmlZA/ 5blpxqzkblVNibz8jN4e29mGc1DBD5r5WT/eLX+5cKtf9HAJcUKbuKpZ9/rPVYmgvf8X rpoGoR5jDP42VkwTx43U5C8Euf+r3E+1C4r2BibNkJDqUD/dBjKhDaaHY2EE+sZRXhGT TDhQ== X-Gm-Message-State: AMke39kcG5K5GxVZuWnGGmR8r5UtqAKJ9Dr64DaRNtGj0kT4/r+FfcmrF17pQ9S2QiwOWA== X-Received: by 10.223.145.193 with SMTP id 59mr8790412wri.82.1487870686074; Thu, 23 Feb 2017 09:24:46 -0800 (PST) Received: from localhost (port-435.pppoe.wtnet.de. [84.46.1.180]) by smtp.gmail.com with ESMTPSA id k4sm7658618wmf.22.2017.02.23.09.24.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Feb 2017 09:24:44 -0800 (PST) From: Thierry Reding To: "David S . Miller" Cc: Giuseppe Cavallaro , Alexandre Torgue , Rob Herring , Mark Rutland , Joao Pinto , Alexandre Courbot , Jon Hunter , netdev@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] net: stmmac: Check for DMA mapping errors Date: Thu, 23 Feb 2017 18:24:34 +0100 Message-Id: <20170223172438.14770-4-thierry.reding@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170223172438.14770-1-thierry.reding@gmail.com> References: <20170223172438.14770-1-thierry.reding@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 6b7a5ce19589..d7387919bdb6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2072,6 +2072,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));