From patchwork Fri Sep 22 20:32:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timur Tabi X-Patchwork-Id: 817694 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="UbuiPO0H"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="hYfblGka"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xzQCR6MFzz9t38 for ; Sat, 23 Sep 2017 06:32:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752487AbdIVUcu (ORCPT ); Fri, 22 Sep 2017 16:32:50 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:55924 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752005AbdIVUcs (ORCPT ); Fri, 22 Sep 2017 16:32:48 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 4834A60274; Fri, 22 Sep 2017 20:32:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506112368; bh=riJpsUEK9gVTfGwbzkfATJN70isjw0XNjT0lZC5DuBg=; h=From:To:Cc:Subject:Date:From; b=UbuiPO0H56UHNtr/uIziwCBzgqYmIM02vNGyw3mYisN+JfYOW0NixHpvm6oeWDYHN T/vJYNLLYMWhn3r31FODhbjZFkiKsv0WRm6uK8P6DShwbOXx9CqsHarwT/ztVTbw3O 20sCbzelf+Y6qWvqUVv5he2h58aKta57dQGGe4hI= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from timur-ubuntu.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: timur@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 4C25A60274; Fri, 22 Sep 2017 20:32:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506112367; bh=riJpsUEK9gVTfGwbzkfATJN70isjw0XNjT0lZC5DuBg=; h=From:To:Cc:Subject:Date:From; b=hYfblGkaWbLXqotdHIZsoV6BsPjPpENHPm0YFSshIkEFkDwYauRY8BKrlMTJ2o7dK XzdT3gd2eS5/qGm9ZYMfy5y1COloTIJwejM5an9e1384hmJ3QiUftAg9kzPEYt2pTt eaek6P/FoaNO2c4ichCv7HsiJVTtQ2ejpNJxub1s= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4C25A60274 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=timur@codeaurora.org From: Timur Tabi To: "David S. Miller" , netdev@vger.kernel.org, stable@vger.kernel.org Cc: timur@codeaurora.org Subject: [PATCH] [for 4.14] net: qcom/emac: specify the correct size when mapping a DMA buffer Date: Fri, 22 Sep 2017 15:32:44 -0500 Message-Id: <1506112364-26787-1-git-send-email-timur@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When mapping the RX DMA buffers, the driver was accidentally specifying zero for the buffer length. Under normal circumstances, SWIOTLB does not need to allocate a bounce buffer, so the address is just mapped without checking the size field. This is why the error was not detected earlier. Fixes: b9b17debc69d ("net: emac: emac gigabit ethernet controller driver") Cc: stable@vger.kernel.org Signed-off-by: Timur Tabi --- drivers/net/ethernet/qualcomm/emac/emac-mac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qualcomm/emac/emac-mac.c b/drivers/net/ethernet/qualcomm/emac/emac-mac.c index 0ea3ca09c689..3ed9033e56db 100644 --- a/drivers/net/ethernet/qualcomm/emac/emac-mac.c +++ b/drivers/net/ethernet/qualcomm/emac/emac-mac.c @@ -898,7 +898,8 @@ static void emac_mac_rx_descs_refill(struct emac_adapter *adpt, curr_rxbuf->dma_addr = dma_map_single(adpt->netdev->dev.parent, skb->data, - curr_rxbuf->length, DMA_FROM_DEVICE); + adpt->rxbuf_size, DMA_FROM_DEVICE); + ret = dma_mapping_error(adpt->netdev->dev.parent, curr_rxbuf->dma_addr); if (ret) {