From nobody Thu Oct 2 09:21:07 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 AFB8D299AAF for ; Thu, 18 Sep 2025 12:11:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758197499; cv=none; b=oigLMbVCYFN4Hhr0JDrCiI6fSgEeGmOQlK1uVWJhCn5l0CX/T38O2l8MuVBWLqB0TTYaIPEKragUH8VUbhEBj+wkAYbnOPSKBrh7kHOAtuxvfpvZwHMPLa7LzW8wkA0nv9+53qbdqDasjTuEBujCJbcI6tJkALCR7BKIVwtJ8Sw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758197499; c=relaxed/simple; bh=pM/QS29tKZw2LpLFbZO+mNiT8s/PArRVEDjFQoj0pLY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tkjpRa2ig+FK3EP3qpQ2/buK1hw6fDWLd1r9PBBynjcRnv++bsdDzXGafb3SjEGEbSSqYwgmGyI1S5y70J4WrfLonv8a09/9m+Ajp60dM6Wvpv/seSDrKH7Nx8A7R9fFnoRU+8ZUnP0vKh+XbMZjQYCFWjI6pAAM9pAmaeJ5SLU= 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=dpGC0pIE; arc=none smtp.client-ip=209.85.214.176 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="dpGC0pIE" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2445826fd9dso10376705ad.3 for ; Thu, 18 Sep 2025 05:11:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758197497; x=1758802297; 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=GAoC+ZaDxdXo+spV/LmE7DgvWELZkUtLA5pPamornbw=; b=dpGC0pIE6D80o2+1xZ03B2s4M5CQMCovQlNBxkkTLeVVTZlUOW6vF8HHrbhYZ7w5q+ 9YMKROhaTqK6d9xosoZGYaZlYW3Saeh2qFMdnYBYpZDLVnl9BgRlivkFAFKlUiAzul+x x6fSN3AKGgwsVan2jOE/vIKiwHXqHb6o4pcCRhQZQ1k44kKfgig+XUfeG99vGmsZqMR3 HYaapBuYbtcwEbnrwcn2+xqxqotKYWzcxb42aIscncFp2KvdICzyEZalPcaxj+KNAIft yUFihf8afoynZkBe8rXIAuj+YhNdfFHLuvDmKRMr0MiXyQxeqAgsfts3lDGh+iCS+v2m L7jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758197497; x=1758802297; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GAoC+ZaDxdXo+spV/LmE7DgvWELZkUtLA5pPamornbw=; b=c2gvOh7JtxVBdhk2QjlxhP4VrKYjQ1daaAZ/xq2ZT7PstP0KaN/UTjVRdGy9IJ5vV8 7Vp3SGqd/X5+HYqmkRvVXEreMf9GjUENAxRXSO+h9pYhu3p3P7So/C2z1xshdYnsbjGc ceW9YU+0/jif1oEN7dOcFTsjBiJZrVJWMinRbwlVw7jW7RCEwYMnL7c4ZNlEKwDpnWZF pKuGq/8AwKAuL6Lbq1FLIH0b2yCuIuvTeDaV2upAnPUHP5QeyPyysuNdf1SLp84SyVIO Nw1N4daa4yRQi2/P8w/hYNHKfH9DyoKeSlHK1Xsve5LgMYlDc9Cyw6EldRWpszGrxVSW JdPQ== X-Forwarded-Encrypted: i=1; AJvYcCUaaeeMZ8ap1ANWDeAWX5iRxZ2qZX3FiIzMCAoddZ97RKCksNjNplNihXR1Xkr85C39PVU2+CUODn+/Gck=@vger.kernel.org X-Gm-Message-State: AOJu0YxESxb8S6ZMVs1ZcZrUHQYNv8XcQeOfSF8EpBLoXg3ya8mJr8fH CPUYMIjfwNF5+HGbvuBIYdyJtx+1SG3xF+GIlkOrp0nzB190HwpQCj7k X-Gm-Gg: ASbGncthEQ33yKBN6nT6BzoEC3/gtnlKZEndHG9977rscgEnQOUpvl0d6xB/BwpiR0j 8nMtC09VDyIG48tKagk0lepmQrf2Vu5RDyQlIpNJRQRBRf03cATSYIc3gjal32hy2vVpxCgeLFJ lfH/EFFzkUCb/XlPZt4YaRv3192YSNNJEBAnwGzR29ZqCwxsMZ48XqKPl736pfvuLmbyC59BFOM wtg7MLkjWSlYqiVnDbrfycKVS3QpoqnZLjggnNqFMofmyGyEcdEkKouG8gzTGohAv0iIPwiqDMw 7rHYxnSaiTVR5YMPu2oJg1VALkllAty46ZouUZ4lBKC8KAU6V1ZxlcDt6XIOBc5GWvqUPdQA9fs FKDTw1YE4jTc4bQzYG44iRA3jq0G/Hy9ixyWqh8s= X-Google-Smtp-Source: AGHT+IG0U3CDVX4gT2JNVdHXAgEHkLdFsWTYpr4SHEqTj4aBiuSHXKemrWgFeH7m9flFwFyjVfVlIA== X-Received: by 2002:a17:903:37ce:b0:264:ee2:c40f with SMTP id d9443c01a7336-26813cfb8famr72310705ad.52.1758197497020; Thu, 18 Sep 2025 05:11:37 -0700 (PDT) Received: from lgs.. ([223.80.110.60]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-269800529cdsm24686835ad.22.2025.09.18.05.11.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Sep 2025 05:11:36 -0700 (PDT) From: Guangshuo Li To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Guangshuo Li , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Jeff Garzik , "Maciej W. Rozycki" , Mariusz Kozlowski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org Subject: [PATCH] net: ethernet: broadcom: sb1250-mac: Add checks for kcalloc() in sbdma_initctx() Date: Thu, 18 Sep 2025 20:10:51 +0800 Message-ID: <20250918121051.3504490-1-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Two kcalloc() allocations (descriptor table and context table) can fail and are used unconditionally afterwards (ALIGN()/phys conversion and dereferences), leading to potential NULL pointer dereference. Check both allocations and bail out early; on the second failure, free the first allocation to avoid a leak. Do not emit extra OOM logs. Fixes: 73d739698017 ("sb1250-mac.c: De-typedef, de-volatile, de-etc...") Fixes: c477f3348abb ("drivers/net/sb1250-mac.c: kmalloc + memset conversion= to kcalloc") Cc: stable@vger.kernel.org Signed-off-by: Guangshuo Li --- drivers/net/ethernet/broadcom/sb1250-mac.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ether= net/broadcom/sb1250-mac.c index 30865fe03eeb..e16a49e22488 100644 --- a/drivers/net/ethernet/broadcom/sb1250-mac.c +++ b/drivers/net/ethernet/broadcom/sb1250-mac.c @@ -625,6 +625,8 @@ static void sbdma_initctx(struct sbmacdma *d, struct sb= mac_softc *s, int chan, d->sbdma_dscrtable_unaligned =3D kcalloc(d->sbdma_maxdescr + 1, sizeof(*d->sbdma_dscrtable), GFP_KERNEL); + if (!d->sbdma_dscrtable_unaligned) + return; /* avoid NULL deref in ALIGN/phys conversion */ =20 /* * The descriptor table must be aligned to at least 16 bytes or the @@ -644,7 +646,11 @@ static void sbdma_initctx(struct sbmacdma *d, struct s= bmac_softc *s, int chan, =20 d->sbdma_ctxtable =3D kcalloc(d->sbdma_maxdescr, sizeof(*d->sbdma_ctxtable), GFP_KERNEL); - + if (!d->sbdma_ctxtable) { + kfree(d->sbdma_dscrtable_unaligned); + d->sbdma_dscrtable_unaligned =3D NULL; + return; + } #ifdef CONFIG_SBMAC_COALESCE /* * Setup Rx/Tx DMA coalescing defaults --=20 2.43.0