From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FDE62641C6 for ; Mon, 22 Jun 2026 02:19:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782094795; cv=none; b=bqgj30jC/vwwgdV6z9CIiNFC5ZTE4Eaw4KUuZ1Qhvxy1ojp6jStGei42JNBlRrV2zrjcQl0+kAiSdTFXGxOrlFC3ktBW6qi0dsflBaG9aAUQcVD8uz3ABcUY9suewlCBFycv4f45JNuo9K+LQQqnFr02pvju96E/5hsnyv4W9UE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782094795; c=relaxed/simple; bh=RNKVa59Qn4Eyw+QDmSFP8k4Ho5HLCcH8s6ogTgazp08=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=f01V4mZ1lTlRdsKAYlqmmq9X9+WB0n/90y5vuXHJk5EtwxRER6xoSoBzLKiKbnJyC6EgegQIWejRBhYYp+QTCkuBqZfvl1Advfd4U2Gw1778Tu/htf4aJpIYLofuHF7Yb5Dt8k26QZND6fhYYGvuMy+1MGKpj4+UGZrcQrEdY/0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NICeIIvu; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NICeIIvu" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-8423f236418so1870028b3a.1 for ; Sun, 21 Jun 2026 19:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782094793; x=1782699593; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=29xapzBjyR6XHNY57KVovLYepGDk91b9qO2OwIQ4sGc=; b=NICeIIvue0maX7m2jZOsRW4XfTf/D3yhNKYKNZ/pr9gb1NMNMPz53EjC1Ia7/99xls wdMP7OBPh4IWxCBwbu76If5a0DbnUsDaFf/c2QZzp6W5SW+PylBcE66SygO8E6dSpt9p mCkuq2w1PWMwIwKEe/df4lh4iRSR8OOKbtCF6Zk8cH4bM7eGVhzdNOcR+nJ+ieQOny3M GzyVg4eT8dbflmdC2mlbDksv3e4aafDzpcuTQdV7TI+EaOL++1N0hzTFuM/QoEWJoSkC EhaX53yCMU8yoMK24HYi5x9wajHllMivalKnO3OChAJJ/I4Vt+DRy1t41u2BqngLEOyu jfbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782094793; x=1782699593; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=29xapzBjyR6XHNY57KVovLYepGDk91b9qO2OwIQ4sGc=; b=gl00MumjZGPfX9FPBgRI2mmYFu+4/NW3S4iq3JpvRP809l0116et5flB4h9q3SLeDo jnucRn0PpBEjhD9UUCIcyiedYczwIW7Mf8vrkQ3kn0Qmi5vzlKplBGiRENjHOIKKIFJ9 iQcu//3gMTY7L3ESISC9qjfKg8JxwzH0n6rFMD8c64iSC275wdNVUZO8yjA00i70ZuUf v+b2YiCga24qqwA4IEXVVQO9rcTI7QY5lgUfO4uwJUTg17D5zFQWcqIMfNXsDbs17FNs 6glLlPiD93siHdXbdTmBCqGIDiJrSzfKrzW7b9mhPaDiHowqfBFF9p9Ta8qn58LXRS7k HSaA== X-Forwarded-Encrypted: i=1; AFNElJ/uRJezs8n42p0o5tQOT1o38l4fuCZuxkbqYdLlq0yWL3X+RXguwI5FdL7YPJxw+gaxwjk/mSAxWh75KmA=@vger.kernel.org X-Gm-Message-State: AOJu0YzT9PXmbmv68OHm8AkrvCDNvVQH6XW94Im/HTO/ONrSiHLQ8bsp y91PTuyKp9NzK2+1NTtmAD+xDAO3hz5yBrxj3xqBOw2rBUIF8lkEHAYK23IZiw== X-Gm-Gg: AfdE7cl2JyuHZHtyTRI9FvcPghOIg5fG59vFnTJ9EyJQYBgTVq9CN2MQ+YlEAje8E55 vhVAArlC6qHOPOPv0/32JhqZzPxAodHjWC+dfsYP4hXblVXs6DJxedgkrsYSGUOJPArWhYsI5Ko sbIb/GlTgeMuuVn4/mXmU42HXH3RXC6gTAmJQMkn57Mc6DxxVn7CXLyjPXNZcMRSM4Va35ZKeId rpJR8hmGGE6/SaFzLsgzvJiQCQ4PYcRDZKRZFMzkaNZgL1I3sm1Qk0i/Z5WGF6qUOpPuHewazvt Mm57nlVpZGJT5il6u8l5eiL5I5IYjLyPrmykRDirBfKMwKHvUEEpXtMm2ki5d9FlCGF4Z9xlK2L Pio1jyhN9K+at13hzcKvOaZR+uoGZd31lfWzVMQKeUIZi32WoZRe2r2GAnXbf+czN5GP+RrrESZ Tm1FBwccAPo7YiIElANhKgL4ALbSp1dav14RjpjCm7dqscRwYCTrvuUgV2K32DqNnp9LJCCUy45 kgjmQaDKK5pdIg6w7OwXkkUWhJH7c0tJzs= X-Received: by 2002:a05:6a00:f89:b0:842:5a8d:302c with SMTP id d2e1a72fcca58-845508efe8amr13815339b3a.38.1782094792815; Sun, 21 Jun 2026 19:19:52 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:af13:6f5d:b398:9987]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84564da30b5sm6158194b3a.25.2026.06.21.19.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2026 19:19:52 -0700 (PDT) From: Rosen Penev To: netdev@vger.kernel.org Cc: Claudiu Manoil , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Sandeep Gopalpet , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net] gianfar: fix memory leak in gfar_parse_group error paths Date: Sun, 21 Jun 2026 19:19:34 -0700 Message-ID: <20260622021934.1415455-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In gfar_parse_group, if any allocation in the irqinfo[] loop fails, or if of_iomap fails, or if the IRQ parsing fails, the already- allocated irqinfo[] entries and mapped regs are not freed. The caller's free_gfar_dev cannot clean them up because priv->num_grps is only incremented after a successful return. Fix by adding an err_out label that frees all successfully allocated irqinfo entries and unmaps regs if mapped. Track the number of allocated entries with 'allocated' and propagate the correct error code. Fixes: 46ceb60ca80fa ("gianfar: Add Multiple group Support") Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/net/ethernet/freescale/gianfar.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 3271de5844f84..12ebb207be0be 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -502,17 +502,19 @@ static int gfar_parse_group(struct device_node *np, struct gfar_private *priv, const char *model) { struct gfar_priv_grp *grp = &priv->gfargrp[priv->num_grps]; - int i; + int err = -ENOMEM; + int i, allocated = 0; for (i = 0; i < GFAR_NUM_IRQS; i++) { grp->irqinfo[i] = kzalloc_obj(struct gfar_irqinfo); if (!grp->irqinfo[i]) - return -ENOMEM; + goto err_out; + allocated++; } grp->regs = of_iomap(np, 0); if (!grp->regs) - return -ENOMEM; + goto err_out; gfar_irq(grp, TX)->irq = irq_of_parse_and_map(np, 0); @@ -522,8 +524,10 @@ static int gfar_parse_group(struct device_node *np, gfar_irq(grp, ER)->irq = irq_of_parse_and_map(np, 2); if (!gfar_irq(grp, TX)->irq || !gfar_irq(grp, RX)->irq || - !gfar_irq(grp, ER)->irq) - return -EINVAL; + !gfar_irq(grp, ER)->irq) { + err = -EINVAL; + goto err_out; + } } grp->priv = priv; @@ -567,6 +571,13 @@ static int gfar_parse_group(struct device_node *np, priv->num_grps++; return 0; + +err_out: + for (i = 0; i < allocated; i++) + kfree(grp->irqinfo[i]); + if (grp->regs) + iounmap(grp->regs); + return err; } /* Reads the controller's registers to determine what interface -- 2.54.0