From patchwork Wed Feb 5 21:38:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Merello X-Patchwork-Id: 3591561 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5ECC29F2E9 for ; Wed, 5 Feb 2014 21:37:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99BF920163 for ; Wed, 5 Feb 2014 21:37:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C641C20114 for ; Wed, 5 Feb 2014 21:37:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754530AbaBEVhv (ORCPT ); Wed, 5 Feb 2014 16:37:51 -0500 Received: from mail-ee0-f48.google.com ([74.125.83.48]:52213 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754418AbaBEVhu (ORCPT ); Wed, 5 Feb 2014 16:37:50 -0500 Received: by mail-ee0-f48.google.com with SMTP id t10so503939eei.7 for ; Wed, 05 Feb 2014 13:37:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wx0C2w6W2l2U5gUK54zWZtnTJO7zIGfCGKssr+SV1W8=; b=wHUN1hayQL/TpaCmGVOnvuxSgww/VYrNP1iSLt1UVhgp0BJ8Sl62NYylqH71w0WT9t ppgOagsz9TRIN8r1vGZW/WoqQqme4KrawqClhzrtDCxANagB2uP36i5S4CVD3oOCZDql aUAHCCBpyvpMWwrdsbLRvkxc0wtjhMiLKMUE48UmdL7xPVgcWLdeAo7DPUH7i/d4nw1t +uNeQfeOmuQruxHBcr1Wlw6JJwhVMghAx7AkR0YJT9eaNrxh6UbRERxdeqSKDLCBQTku RowHVIMEJG0R2MtIofpTD/4aLN9vK5Dg92fi3YCRSzQqkntSq4KtBU1+Y4ydgBIv1wY3 wcSA== X-Received: by 10.15.73.134 with SMTP id h6mr4578127eey.15.1391636268909; Wed, 05 Feb 2014 13:37:48 -0800 (PST) Received: from localhost.localdomain (host209-123-dynamic.54-79-r.retail.telecomitalia.it. [79.54.123.209]) by mx.google.com with ESMTPSA id v7sm106105864eel.2.2014.02.05.13.37.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 13:37:47 -0800 (PST) From: andrea merello To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Larry.Finger@lwfinger.net, "andrea.merello" Subject: [PATCH 3/4] Add error check for pci_map_single return value in rtl8180 TX path Date: Wed, 5 Feb 2014 22:38:06 +0100 Message-Id: <1391636287-17712-4-git-send-email-andrea.merello@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1391636287-17712-1-git-send-email-andrea.merello@gmail.com> References: <1391636287-17712-1-git-send-email-andrea.merello@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "andrea.merello" Orignal code will not detect a DMA mapping failure, causing the HW to attempt a DMA from an invalid address. This patch add the error check and eventually simply drops the TX packet if we can't map it for DMA. Signed-off-by: andrea.merello Signed-off-by: andrea merello Acked-by: Larry Finger --- drivers/net/wireless/rtl818x/rtl8180/dev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index 1c6ac25..9645ed2 100644 --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c @@ -276,6 +276,13 @@ static void rtl8180_tx(struct ieee80211_hw *dev, mapping = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE); + if (pci_dma_mapping_error(priv->pdev, mapping)) { + kfree_skb(skb); + dev_err(&priv->pdev->dev, "TX DMA mapping error\n"); + return; + + } + tx_flags = RTL818X_TX_DESC_FLAG_OWN | RTL818X_TX_DESC_FLAG_FS | RTL818X_TX_DESC_FLAG_LS | (ieee80211_get_tx_rate(dev, info)->hw_value << 24) |