From patchwork Mon Apr 13 13:52:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 460793 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 211C91402F6 for ; Mon, 13 Apr 2015 23:53:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932079AbbDMNw6 (ORCPT ); Mon, 13 Apr 2015 09:52:58 -0400 Received: from static.88-198-24-112.clients.your-server.de ([88.198.24.112]:51324 "EHLO nbd.name" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753063AbbDMNwr (ORCPT ); Mon, 13 Apr 2015 09:52:47 -0400 Received: by nf.local (Postfix, from userid 501) id DEEF2DAD6E0C; Mon, 13 Apr 2015 15:52:42 +0200 (CEST) From: Felix Fietkau To: netdev@vger.kernel.org Cc: zajec5@gmail.com, hauke@hauke-m.de Subject: [PATCH v4 5/9] bgmac: add check for oversized packets Date: Mon, 13 Apr 2015 15:52:38 +0200 Message-Id: <1428933162-26763-5-git-send-email-nbd@openwrt.org> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1428933162-26763-1-git-send-email-nbd@openwrt.org> References: <1428933162-26763-1-git-send-email-nbd@openwrt.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In very rare cases, the MAC can catch an internal buffer that is bigger than it's supposed to be. Instead of crashing the kernel, simply pass the buffer back to the hardware Signed-off-by: Felix Fietkau --- drivers/net/ethernet/broadcom/bgmac.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index e004588..3ac8d9a 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -422,6 +422,14 @@ static int bgmac_dma_rx_read(struct bgmac *bgmac, struct bgmac_dma_ring *ring, break; } + if (len > BGMAC_RX_ALLOC_SIZE) { + bgmac_err(bgmac, "Found oversized packet at slot %d, DMA issue!\n", + ring->start); + rx->len = cpu_to_le16(0xdead); + rx->flags = cpu_to_le16(0xbeef); + break; + } + /* Omit CRC. */ len -= ETH_FCS_LEN;