From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [ 24/61] net: calxedaxgmac: throw away overrun frames Date: Tue, 12 Feb 2013 12:34:44 -0800 Message-ID: <20130212203421.644811246@linuxfoundation.org> References: <20130212203417.890993903@linuxfoundation.org> Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Herring , "David S. Miller" , netdev@vger.kernel.org To: linux-kernel@vger.kernel.org Return-path: In-Reply-To: <20130212203417.890993903@linuxfoundation.org> Sender: stable-owner@vger.kernel.org List-Id: netdev.vger.kernel.org 3.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rob Herring [ Upstream commit d6fb3be544b46a7611a3373fcaa62b5b0be01888 ] The xgmac driver assumes 1 frame per descriptor. If a frame larger than the descriptor's buffer size is received, the frame will spill over into the next descriptor. So check for received frames that span more than one descriptor and discard them. This prevents a crash if we receive erroneous large packets. Signed-off-by: Rob Herring Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/calxeda/xgmac.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c @@ -546,6 +546,10 @@ static int desc_get_rx_status(struct xgm return -1; } + /* All frames should fit into a single buffer */ + if (!(status & RXDESC_FIRST_SEG) || !(status & RXDESC_LAST_SEG)) + return -1; + /* Check if packet has checksum already */ if ((status & RXDESC_FRAME_TYPE) && (status & RXDESC_EXT_STATUS) && !(ext_status & RXDESC_IP_PAYLOAD_MASK))