From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4410A1DE89C for ; Tue, 3 Dec 2024 09:18:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733217499; cv=none; b=qQMNllGBNUoKWVIDRKUgIFsecUwKyUvGfKP5Zl7uNjieKnlVy6oiXW1xuM7ST1td6dV9Ghkz3nUfaz7spMDqUPKngH8Uxx2BzQ/ZV+Cu74sP51uInlTjVtylODoCSzo7o/X1M54hl+N8cFtUX3J+GwvmDc6iLuzL3QehTI1DlvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733217499; c=relaxed/simple; bh=kRkSyCEnZ2Nk2xqnPo5YQN9UhUU73YcjSEEL/NQjExg=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=iDdnmQ1icQiCUoqEVL9mUgz9ac1UdUwzPq3aC6adtcf0JlMlGk5Mg5t87B130rFMip1xGUmeS1qvhvmwO9V4UCNJL1SeqYJ1dyY69iISVa4GN+3sOTDi9HXT/fi8Yd3HKOfJbP8O6gV/JGEWfIm+3wecPZkpemTyoxniDrA6xrU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0hl65X31; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0hl65X31" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 605AAC4CECF; Tue, 3 Dec 2024 09:18:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733217498; bh=kRkSyCEnZ2Nk2xqnPo5YQN9UhUU73YcjSEEL/NQjExg=; h=Subject:To:Cc:From:Date:From; b=0hl65X31LuVDsD1MC/beY0JiaEmfIWMkDbKy27FMnLcjOZWRKm3vE9vJx86RRJZsK jHNch/DGcKacyW/HxiGu37/9OUTdhHTL5y98Zp9dehsKWxnj9xtmJF/duveVOXRPgz Pyj0zbN5Vf+m90WkMIb6fuIcqq2MhA/mj4OK4vqI= Subject: FAILED: patch "[PATCH] gpio: grgpio: Add NULL check in grgpio_probe" failed to apply to 6.11-stable tree To: hanchunchao@inspur.com,bartosz.golaszewski@linaro.org Cc: From: Date: Tue, 03 Dec 2024 10:18:12 +0100 Message-ID: <2024120312-deftly-nutlike-b9ba@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.11-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.11.y git checkout FETCH_HEAD git cherry-pick -x 050b23d081da0f29474de043e9538c1f7a351b3b # git commit -s git send-email --to '' --in-reply-to '2024120312-deftly-nutlike-b9ba@gregkh' --subject-prefix 'PATCH 6.11.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 050b23d081da0f29474de043e9538c1f7a351b3b Mon Sep 17 00:00:00 2001 From: Charles Han Date: Thu, 14 Nov 2024 17:18:22 +0800 Subject: [PATCH] gpio: grgpio: Add NULL check in grgpio_probe devm_kasprintf() can return a NULL pointer on failure,but this returned value in grgpio_probe is not checked. Add NULL check in grgpio_probe, to handle kernel NULL pointer dereference error. Cc: stable@vger.kernel.org Fixes: 7eb6ce2f2723 ("gpio: Convert to using %pOF instead of full_name") Signed-off-by: Charles Han Link: https://lore.kernel.org/r/20241114091822.78199-1-hanchunchao@inspur.com Signed-off-by: Bartosz Golaszewski diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c index 7ffe59d845f0..169f33c41c59 100644 --- a/drivers/gpio/gpio-grgpio.c +++ b/drivers/gpio/gpio-grgpio.c @@ -369,6 +369,9 @@ static int grgpio_probe(struct platform_device *ofdev) gc->owner = THIS_MODULE; gc->to_irq = grgpio_to_irq; gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", np); + if (!gc->label) + return -ENOMEM; + gc->base = -1; err = of_property_read_u32(np, "nbits", &prop);