From patchwork Sat Mar 26 21:24:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 602210 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 3qXY9Z46lmz9s3T for ; Sun, 27 Mar 2016 08:25:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b=BRQFzjjW; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754274AbcCZVZF (ORCPT ); Sat, 26 Mar 2016 17:25:05 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:36192 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753975AbcCZVZD (ORCPT ); Sat, 26 Mar 2016 17:25:03 -0400 Received: by mail-wm0-f48.google.com with SMTP id l71so2393982wmg.1 for ; Sat, 26 Mar 2016 14:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oqr3nmN+2u5o907L5WxFb/uBDoiiEFft906nHEJnM4s=; b=BRQFzjjWIfPiWkBy9EtjfDWS9Agf2839GeL5U1T8+7jiu760jJBNjvi3RQegUSRgEu 11fxEgXnAAf/5sSUtnVl1WTm0TeUVftfvu6SYTHz7MNEjmMDpsQ4t+GNBTw5ZzlJZUBt JVGXXrCfjwBxTJhgo6SZnICxgmqAlYq2zO5+M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oqr3nmN+2u5o907L5WxFb/uBDoiiEFft906nHEJnM4s=; b=m8eAv0EIjFosHr1HRpnXAK60zD3Lw7Cdv86FiVHvT4/A/xNbr6JRgkzZpaXCf8i7vd DykwtyuO+4m/Fh/VVppKfD83FB8t7Z9jyG0Vbk23v7xKmAsweaY1/YHyOwSQcdd87d0R xi6jUJ4qOzJsxsz7XQP6cYWi75mmCDyYCui6iuIQCh37Jrxvsb59HXmgnsDkXcspoxT0 kH4zCLSceVNMTrr7htsO7pw/PxPS+440S8lac+8zAOETPVplNFWzIVH4U3qjmXhEy/mq xSWdQLjY304tGPEFJ4n8N6czinAqeFvZp1Ao/oBUQYv40z9J9wbLXSaQSeOWZCEhZJxN mpAw== X-Gm-Message-State: AD7BkJJIZd2m+YLhys6718AcuuqKyTMLszlIMs8/EFLwjonIhdVzxOlI2HyPDnM7yt4zgw== X-Received: by 10.28.195.9 with SMTP id t9mr3444748wmf.0.1459027501297; Sat, 26 Mar 2016 14:25:01 -0700 (PDT) Received: from localhost.localdomain (lvps87-230-87-209.dedicated.hosteurope.de. [87.230.87.209]) by smtp.gmail.com with ESMTPSA id x1sm17023365wjx.45.2016.03.26.14.25.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 26 Mar 2016 14:25:00 -0700 (PDT) From: Rasmus Villemoes To: David Miller Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: sxgbe: fix error paths in sxgbe_platform_probe() Date: Sat, 26 Mar 2016 22:24:09 +0100 Message-Id: <1459027449-2667-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.4 In-Reply-To: <877fgue1mx.fsf@rasmusvillemoes.dk> References: <877fgue1mx.fsf@rasmusvillemoes.dk> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need to use post-decrement to ensure that irq_dispose_mapping is also called on priv->rxq[0]->irq_no; moreover, if one of the above for loops failed already at i==0 (so we reach one of these labels with that value of i), we'll enter an essentially infinite loop of out-of-bounds accesses. Signed-off-by: Rasmus Villemoes Reviewed-by: Francois Romieu --- David, can you take this directly? Of the three samsung people listed by get_maintainer.pl, one address bounces and another informed me privately that he's not actually a maintainer of this anymore. drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c index b02eed12bfc5..73427e29df2a 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c @@ -155,11 +155,11 @@ static int sxgbe_platform_probe(struct platform_device *pdev) return 0; err_rx_irq_unmap: - while (--i) + while (i--) irq_dispose_mapping(priv->rxq[i]->irq_no); i = SXGBE_TX_QUEUES; err_tx_irq_unmap: - while (--i) + while (i--) irq_dispose_mapping(priv->txq[i]->irq_no); irq_dispose_mapping(priv->irq); err_drv_remove: