From nobody Mon Feb 9 08:53:39 2026 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 6CDCD2032C for ; Tue, 2 Apr 2024 11:42:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712058129; cv=none; b=kfAwXKoYVydqCBA/s5dihwAmhC3X1Yo0xX8CWP8wLv5yLW/ElPnT83Ufp8MQwbiUeeo6Y4Js6Wwr5phhU1FIhAQdjJWQjriUBOfsfGZ4WtNoOZNOpBVjtAvdIXV+5tZpeZVekVcUFg+Ndl7iZ6wp1ssOdJmHnjv+0ZSIzuSmPAg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712058129; c=relaxed/simple; bh=4JZgCjJUm3vYm3YzQEvW4qxgetUWkPZYeaBKSxKI9SM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=NBaIrqS7GODVLQDcLtB+eEFWEBm55mFm6Bda59eIJgX0YSgnN9k9b6YE7tlLLBMQsybsNuW11rJsc9daIE7QqvkkH4A2M5oTDH1hCoPWXiOgT/KtawRMzes4ad8e3z5HH6RVWSAYZIpXdhWu0voNaOzG5pR9r981RvmuhvSLYA4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=vyQAQvjz; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="vyQAQvjz" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4161bd0a4ecso3289825e9.1 for ; Tue, 02 Apr 2024 04:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1712058126; x=1712662926; 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=yCosdLqhfQl3fw66HOWtcsInpfXJnB5cNYDVDMw2WSI=; b=vyQAQvjzOhcZjIoQSb1pJBJp69T77RkzVbCP00fi8WzG5mesmSSpnQxzJIPFxGYIc3 ZISCC73UIp2+N4SXjS+ad20mTTf908vECJLCTe5oJaIy8yRx7Gpq8c7lGsrVSn8SLK+a 9rOmvaYkBZfue7WphAw+4PvN9MR8MVdl+eaiqc0sMsT1aqcZz7FMDYKtOOJtUBlFV4CN QiYsQpoEwcyOJAbeGGFEAymLUvyxoc1CEsFcqMXIi5nB22vnXXOJXHCEW23IIY3bz95u iAsCn3DkJRmI6uUi4ZZiWnPwRV5JPgk+eSP6YaKM+jFvUixvYpBX0+OHKzaG9+tBCT6u bNvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712058126; x=1712662926; 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=yCosdLqhfQl3fw66HOWtcsInpfXJnB5cNYDVDMw2WSI=; b=puo1i06ef8g/Kd9uBof+ScoGTBG+VWvlzhwS2rX9QZbQR1wnGJTmHNQeXim8yShp9L VCldt/IqZPAQVSFryeft5h/Gs2OLBHRg4oFpwQzkOt51cqkz27CMH2CYdn1W6rp0NPre ojMUdVht7ljClW1EkNfWEquwKE/0YgF8KhEbpJ/Y92IeiqeZDgaO85oJ/NKjfFF1c77i 68sny0o5Yi/W6zNPQYjM+wtzVHN7JdFOmOa5CwIYoW4ZWVJQdus4m5qNzB/+EzbCbs+d ycEuwsZwhxEoStXz5qn37Hh/Rz98PqQ0JIfFrmfCnmA24coMGjm9sMnt33NaBVFUHtVm GkDg== X-Forwarded-Encrypted: i=1; AJvYcCVNOloq4NGyINz8KbbFZW1zSjzaGnQY8mhWTtqLlSF3NjvDNfZtm5dHR+3MPzpo4maM7Czu2SgJ/F7af935CDtex+Pn8JlHmbbLxTMp X-Gm-Message-State: AOJu0YypzTCEyK7f6tBwF2ZAZZZcb+VKkv0ZhRxE/ektMJ8iRsgBf02c 4zeRHo2w8ss+t2V8XLodnXAxbVKDRRvLxp8R/8FSM5WrAuB38Ztla100IUhkO+U= X-Google-Smtp-Source: AGHT+IFXB2QwBRnINWQare9T4ey+AHwU7Qtcx5TtMce6E0RHGApROYLfjdwlFyKGfSKX+HUQkjSu0A== X-Received: by 2002:a05:600c:35d5:b0:414:1363:539f with SMTP id r21-20020a05600c35d500b004141363539fmr9360988wmq.8.1712058125519; Tue, 02 Apr 2024 04:42:05 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:75a:e000:d26c:f9fe:8de3:38f5]) by smtp.gmail.com with ESMTPSA id je14-20020a05600c1f8e00b00414887d9329sm17631524wmb.46.2024.04.02.04.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 04:42:05 -0700 (PDT) From: Bartosz Golaszewski To: Kent Gibson , Linus Walleij Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Dobriyan , stable@vger.kernel.org, Stefan Wahren , Naresh Kamboju , Bartosz Golaszewski , Linux Kernel Functional Testing Subject: [PATCH] gpio: cdev: check for NULL labels when sanitizing them for irqs Date: Tue, 2 Apr 2024 13:41:59 +0200 Message-Id: <20240402114159.32920-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 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" From: Bartosz Golaszewski We need to take into account that a line's consumer label may be NULL and not try to kstrdup() it in that case but rather pass the NULL pointer up the stack to the interrupt request function. To that end: let make_irq_label() return NULL as a valid return value and use ERR_PTR() instead to signal an allocation failure to callers. Cc: stable@vger.kernel.org Fixes: b34490879baa ("gpio: cdev: sanitize the label before requesting the = interrupt") Reported-by: Linux Kernel Functional Testing Closes: https://lore.kernel.org/lkml/20240402093534.212283-1-naresh.kamboju= @linaro.org/ Signed-off-by: Bartosz Golaszewski Tested-by: Anders Roxell --- drivers/gpio/gpiolib-cdev.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c index fa9635610251..1426cc1c4a28 100644 --- a/drivers/gpio/gpiolib-cdev.c +++ b/drivers/gpio/gpiolib-cdev.c @@ -1085,7 +1085,16 @@ static u32 gpio_v2_line_config_debounce_period(struc= t gpio_v2_line_config *lc, =20 static inline char *make_irq_label(const char *orig) { - return kstrdup_and_replace(orig, '/', ':', GFP_KERNEL); + char *new; + + if (!orig) + return NULL; + + new =3D kstrdup_and_replace(orig, '/', ':', GFP_KERNEL); + if (!new) + return ERR_PTR(-ENOMEM); + + return new; } =20 static inline void free_irq_label(const char *label) @@ -1158,8 +1167,8 @@ static int edge_detector_setup(struct line *line, irqflags |=3D IRQF_ONESHOT; =20 label =3D make_irq_label(line->req->label); - if (!label) - return -ENOMEM; + if (IS_ERR(label)) + return PTR_ERR(label); =20 /* Request a thread to read the events */ ret =3D request_threaded_irq(irq, edge_irq_handler, edge_irq_thread, @@ -2217,8 +2226,8 @@ static int lineevent_create(struct gpio_device *gdev,= void __user *ip) goto out_free_le; =20 label =3D make_irq_label(le->label); - if (!label) { - ret =3D -ENOMEM; + if (IS_ERR(label)) { + ret =3D PTR_ERR(label); goto out_free_le; } =20 --=20 2.40.1