From patchwork Tue Apr 15 06:13:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koichiro Den X-Patchwork-Id: 2072649 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4ZcDQF2nQ2z1yJ9 for ; Tue, 15 Apr 2025 16:14:28 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1u4ZZ8-0003xu-9h; Tue, 15 Apr 2025 06:14:38 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1u4ZZ5-0003xC-Q0 for kernel-team@lists.ubuntu.com; Tue, 15 Apr 2025 06:14:35 +0000 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 9739F3F1E4 for ; Tue, 15 Apr 2025 06:14:35 +0000 (UTC) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-7394792f83cso3757857b3a.3 for ; Mon, 14 Apr 2025 23:14:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744697674; x=1745302474; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1A8kJZjyieRJm/SXIzjPudHnyDOMWxj4EO14KOk7E8U=; b=cltnvtX66RET5ZasgfqtYktlzasRHUGWRj+MsK0W2Rfi3pzHE9NGkiPl8zbc0TmmV1 bjPUs7mNutdE/U+LQ9izIYGDKv01Z0+6YDQQeti8utJFJlZJOo6oZneVX80qIroYAUbW ZIYcuGooMWCT9ceyujoeur4yfgU7en8r3OKpi3gjKVN+1LX9HIQen0hddAyDhCHx5pbP Aj5Z83G40wVKl8oWTHI9T6s1+C460BaM50O7mB16H47vwi/1LELpTlncrrCmzEVUXb6o UI2oQO+l5Mzvs/4xEDd/qVs2bWkN+InJ928mM0OFjhAVsi/j5K7QkAjbbFZbS1TcSDNJ +BWg== X-Gm-Message-State: AOJu0YyTVlSG1ZMvCPb3TWsJ9oaZR0q3a9JcsctsH1KcIzkLuMgtnbee IckdEr3qisYhxwXPsQVnoilObfTrk1CTA/CVwLLTej9s72BQt+GU7Lt0gC0EvVKQitTtR/QBnOe 5iTvQHv7d6WA+9EeOkV+xxXBariZdh3A/pmRQrz1cR+9ZeIjzbBsJSM5clrCBmG8ZvhBVEmrIA4 Y9tVehF91ecg== X-Gm-Gg: ASbGncu0z1e6QSe826k3IG7En91uObp4MNaGaGczo4FNT3cRQhnDuSwcuJ5CBPg9p0s 33NV2u0ZX8QGBjkQpLsDCjTCpYRha+LyCh8K8LkjdUbjVHq5eVUisaHjAr28x/bYnM5HbZz1E6e oh0+4X8N+041jXfaGj3J/au+yIbZQDgZLTalqA5Z/AxtPyT3LzjRb5B2dgH18aYjwqTWxs2gVDk 9eWm3dpY2bMFfZMVl8UCfKe3lF6s25l+3Jpb0PtCi94pNjX85p63atFH7WmCE0K89BI1tyJf1LN nzoo5Vi5i1CsZIsT6m7jEvd/b5pKBQ== X-Received: by 2002:a05:6a00:21c4:b0:736:ab48:5b0 with SMTP id d2e1a72fcca58-73bd11a0b42mr20063832b3a.2.1744697673803; Mon, 14 Apr 2025 23:14:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTfAiD0RE4Sw0Ica1cEmo/7wrsb1xYcoljoQu/5OtOQoZkybeAB4J36sY/BNsnq4Hg3DUwiw== X-Received: by 2002:a05:6a00:21c4:b0:736:ab48:5b0 with SMTP id d2e1a72fcca58-73bd11a0b42mr20063810b3a.2.1744697673336; Mon, 14 Apr 2025 23:14:33 -0700 (PDT) Received: from localhost.localdomain ([240f:74:7be:1:a31c:d1db:5e23:e8fb]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd230ddaasm7909286b3a.138.2025.04.14.23.14.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 23:14:32 -0700 (PDT) From: Koichiro Den To: kernel-team@lists.ubuntu.com Subject: [SRU][P][PATCH v2 1/6] UBUNTU: SAUCE: gpio: aggregator: fix "_sysfs" prefix check in gpio_aggregator_make_group() Date: Tue, 15 Apr 2025 15:13:20 +0900 Message-ID: <537f292ca13e7ea688b8abdbdce33e2c63a6b4e5.1744694723.git.koichiro.den@canonical.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: <174469458477.3554672.3738856905360736202@z790sl> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dan Carpenter BugLink: https://bugs.launchpad.net/bugs/2103496 This code is intended to reject strings that start with "_sysfs" but the strcmp() limit is wrong so checks the whole string instead of the prefix. Fixes: 83c8e3df642f ("gpio: aggregator: expose aggregator created via legacy sysfs to configfs") Signed-off-by: Dan Carpenter Reviewed-by: Geert Uytterhoeven Acked-by: Koichiro Den Link: https://lore.kernel.org/r/30210ed77b40b4b6629de659cb56b9ec7832c447.1744452787.git.dan.carpenter@linaro.org Signed-off-by: Bartosz Golaszewski (cherry picked from commit eebfcb98cdc0228f5e1b7407f9db1c602bd8e545 gpio/for-next) Signed-off-by: Koichiro Den --- drivers/gpio/gpio-aggregator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c index d5da90444cac..ac84f171dfba 100644 --- a/drivers/gpio/gpio-aggregator.c +++ b/drivers/gpio/gpio-aggregator.c @@ -1002,7 +1002,7 @@ gpio_aggr_make_group(struct config_group *group, const char *name) * for devices create via legacy sysfs interface. */ if (strncmp(name, AGGREGATOR_LEGACY_PREFIX, - sizeof(AGGREGATOR_LEGACY_PREFIX)) == 0) + sizeof(AGGREGATOR_LEGACY_PREFIX) - 1) == 0) return ERR_PTR(-EINVAL); /* arg space is unneeded */ From patchwork Tue Apr 15 06:13:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koichiro Den X-Patchwork-Id: 2072651 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4ZcDQF4M2Tz1yMn for ; Tue, 15 Apr 2025 16:14:29 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1u4ZZ8-0003yE-Ge; Tue, 15 Apr 2025 06:14:38 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1u4ZZ7-0003xf-7J for kernel-team@lists.ubuntu.com; Tue, 15 Apr 2025 06:14:37 +0000 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id DB38D3F1ED for ; Tue, 15 Apr 2025 06:14:36 +0000 (UTC) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-af9b25da540so3150085a12.2 for ; Mon, 14 Apr 2025 23:14:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744697675; x=1745302475; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ED5U2uXMvpZ2tPBom9TTGf+yazgEgl34N1ErGsHgENM=; b=jbuUpguLsvvkUbE0gCZPW4JDPa6zM2d0zYroJPoiofEW/KNqiqq3RtuFI/F+N9P5Zb 8brMAOpAZeX+xohoJ0JPzMYbffbec4v9kkSsYGDJKnUS9F1QqrdUDHmXJfwsFYBU8tnH AEffuMMdsLu8bwD8DzD1nnmGeBenK9qGz7SPVsU0NI3lljIbfyMUiz/7UAmDnNzpTBtK XiEQGHn2lQnwEnduqXUutcDZojET9anjq8QkGbP13Qny+brhdp7F/d3ez14qUo9t4PMk 0ewCRwjikDbqScBEYn2Dce0/QjTtDVCgEfVlhaujQl6XfQ+iJLYEm5TzmwSPrjwiOD0/ H22A== X-Gm-Message-State: AOJu0YxCbpm6kqELhn5uz47gkyTacxxeayksIA5d0ImWxmJnW5L81apb BaTl0j3qc37EqvdGnMiCTiU7i1Rmr5y5ercf2nqMk0CtI4roEGLVat++3LpOg28yV5pBHBOYHHL 7HmOZj8Buk3sqAHeD7LNg03ZWDKrwnnvKzYMvxOEkbvSlbL8c+7687uzmZnvB4RacKfwCBP2GrB nLUFSSexuc6Q== X-Gm-Gg: ASbGncu9h3e4ri1+6MsDojT4yKtw4OTyoRZ3TRaRysVAo6O+05lFIJ9BgJdHVoO3UGs mYrd2TZWUWseGaN+wwLHtOWABGlAznjmuuugGUKsXgM2rv9PVNWuMzOdd8RWT7rBBi02XRcEPXJ uKNGKl9G0qz/dWKZCCLBP3Q28WvBuAqA4IlWn7TBzDWmnGde/9Sei0F73ObRe2BX0KUtenipmpx RKptA1FjyAbbgffzuLuGkD5PD2CcXb+F3/L9NsewteFCjO4+HkAnNCuLeRr32JooGG6nj4EDwEZ oKjBSDBMlWqkPp3GsKbh92coP9g4Tg== X-Received: by 2002:a17:903:2303:b0:220:fe51:1aab with SMTP id d9443c01a7336-22bea4f6f64mr229955485ad.38.1744697675241; Mon, 14 Apr 2025 23:14:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfL/zuDGt3DhtGYHSatrvi7MXcivpGBqVVqC6sUJysBEBdbWZ2axcrUDDcBA4QWYdu5Qjfpg== X-Received: by 2002:a17:903:2303:b0:220:fe51:1aab with SMTP id d9443c01a7336-22bea4f6f64mr229955115ad.38.1744697674820; Mon, 14 Apr 2025 23:14:34 -0700 (PDT) Received: from localhost.localdomain ([240f:74:7be:1:a31c:d1db:5e23:e8fb]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd230ddaasm7909286b3a.138.2025.04.14.23.14.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 23:14:34 -0700 (PDT) From: Koichiro Den To: kernel-team@lists.ubuntu.com Subject: [SRU][P][PATCH v2 2/6] UBUNTU: SAUCE: gpio: aggregator: Fix gpio_aggregator_line_alloc() checking Date: Tue, 15 Apr 2025 15:13:21 +0900 Message-ID: <5b4229d9131545668a48065acb6421e7692b0273.1744694723.git.koichiro.den@canonical.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: <174469458477.3554672.3738856905360736202@z790sl> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dan Carpenter BugLink: https://bugs.launchpad.net/bugs/2103496 The gpio_aggregator_line_alloc() function returns error pointers, but the callers check for NULL. Update the error checking in the callers. Fixes: 83c8e3df642f ("gpio: aggregator: expose aggregator created via legacy sysfs to configfs") Signed-off-by: Dan Carpenter Acked-by: Koichiro Den Link: https://lore.kernel.org/r/cc71d8cf6e9bb4bb8cd9ae5050100081891d9345.1744452787.git.dan.carpenter@linaro.org Signed-off-by: Bartosz Golaszewski (backported from commit 2e8636ca340002f3ac31383622911a1aa75fb086 gpio/for-next) [koichiroden: adjusted context because Plucky already includes v6 patch series, where relevant functions naming differs from v7] Signed-off-by: Koichiro Den --- drivers/gpio/gpio-aggregator.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c index ac84f171dfba..b31dfcfeb074 100644 --- a/drivers/gpio/gpio-aggregator.c +++ b/drivers/gpio/gpio-aggregator.c @@ -970,8 +970,8 @@ gpio_aggr_device_make_group(struct config_group *group, const char *name) return ERR_PTR(-EINVAL); line = aggr_line_alloc(aggr, idx, NULL, -1); - if (!line) - return ERR_PTR(-ENOMEM); + if (IS_ERR(line)) + return ERR_CAST(line); config_group_init_type_name(&line->group, name, &gpio_aggr_line_type); @@ -1061,8 +1061,8 @@ static int aggr_parse(struct gpio_aggregator *aggr) /* Named GPIO line */ scnprintf(name, sizeof(name), "line%u", n); line = aggr_line_alloc(aggr, n, key, -1); - if (!line) { - error = -ENOMEM; + if (IS_ERR(line)) { + error = PTR_ERR(line); goto err; } config_group_init_type_name(&line->group, name, @@ -1092,8 +1092,8 @@ static int aggr_parse(struct gpio_aggregator *aggr) for_each_set_bit(i, bitmap, AGGREGATOR_MAX_GPIOS) { scnprintf(name, sizeof(name), "line%u", n); line = aggr_line_alloc(aggr, n, key, i); - if (!line) { - error = -ENOMEM; + if (IS_ERR(line)) { + error = PTR_ERR(line); goto err; } config_group_init_type_name(&line->group, name, From patchwork Tue Apr 15 06:13:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koichiro Den X-Patchwork-Id: 2072654 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4ZcDQG74vwz1yMn for ; Tue, 15 Apr 2025 16:14:28 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1u4ZZB-00041D-HI; Tue, 15 Apr 2025 06:14:41 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1u4ZZ8-0003xt-Ao for kernel-team@lists.ubuntu.com; Tue, 15 Apr 2025 06:14:38 +0000 Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 0DF5D3F1ED for ; Tue, 15 Apr 2025 06:14:38 +0000 (UTC) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-af91ea9e884so2638708a12.0 for ; Mon, 14 Apr 2025 23:14:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744697676; x=1745302476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PGzWW1wvJl96O3yKVdWOQ+3UBSA1B9b7cOcHYwUVUsI=; b=o+KZA91VMiD46MDquS28GzaP1wT1AWo5HP6gjEDU17QPxlAFlZNZQxV4jtXb0B4D+J wUTPlNKRIT/xtZUPpO5HmY0qChDKwuRGNt+vTdXhFu/59pQLgpET/ElHYsXRDga6AEJi tc6a+NpaId0BgAHRrVug/KoG0qlCXor/L+nZb5oKkzpKRnAmSH8EwRC3qlVXVNtsOXNm mnTfiGHO5oMLkrq8lk8jt7oC++zVDGbKX66ulS7nFxTg+9TFWxLo+DqJ0D3W8vIe2Bag HFqYKGv+XEOBfg1+OY58pViHlUDz3NV21u/Sm8DUu3wqujOHW7yHNL7xrQs5FKPYxlOt T71A== X-Gm-Message-State: AOJu0YzlTuKmWAFzycnV1FlxWdezkc9hTc4ZjIBqGOvXWVRuafCh+V84 2kFD+WiwsoaVeBM6+2BS6fY+ahdwWktj1pjXLdqBzgBTH044q3qJ0bG1P3ywNkrj8qaUER6RxxN HRWyFrvp5NIlraDrOFBCChVyive87Lwg5H5c5gNRT6QHqgmrenI5FN08PCSPnTZDYaVPf/FmIV6 ghnCXyzuSSbQ== X-Gm-Gg: ASbGncvPdTvKw/SxdbHkBDN0JiMXKn7H29+N5TVmZIB/3KLFF9Nd/sj2EkEQj0c+/nl K0UwkSsn5iSWfx23onoCxbga0nFE+rL9soHjApXm+Pi1p7xL91bD3sbdxch3Y65K+I2xTJ3Vo0e IMS/BV6geXbQqB3CdduB8MTDpvVKqV2rdc4OImSYplOCCZSN2oGlwvrlFF4TjpPtRTtzL5aH/sU Bq/VprTPKoEHo72LU7QFCjBcM0QeGuUboh+DEG7Ql4Ucy1AZpPY6CejDe2DNsXUDE9J4WU5afou +exfztHVvusD2zCVCB2mLshHdqFgrw== X-Received: by 2002:a05:6a21:1786:b0:1ee:a410:4aa5 with SMTP id adf61e73a8af0-20398f6d586mr3404650637.17.1744697676440; Mon, 14 Apr 2025 23:14:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGtEVq3grbO++X3qYG1WnewtUZLj1iP33azYdTBFMXjPMuEJUzqspiDjrztsTXkUjoXABoVsw== X-Received: by 2002:a05:6a21:1786:b0:1ee:a410:4aa5 with SMTP id adf61e73a8af0-20398f6d586mr3404634637.17.1744697676116; Mon, 14 Apr 2025 23:14:36 -0700 (PDT) Received: from localhost.localdomain ([240f:74:7be:1:a31c:d1db:5e23:e8fb]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd230ddaasm7909286b3a.138.2025.04.14.23.14.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 23:14:35 -0700 (PDT) From: Koichiro Den To: kernel-team@lists.ubuntu.com Subject: [SRU][P][PATCH v2 3/6] UBUNTU: SAUCE: gpio: aggregator: Return an error if there are no GPIOs in gpio_aggregator_parse() Date: Tue, 15 Apr 2025 15:13:22 +0900 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: <174469458477.3554672.3738856905360736202@z790sl> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dan Carpenter BugLink: https://bugs.launchpad.net/bugs/2103496 The error handling in gpio_aggregator_parse() was re-written. It now returns success if there are no GPIOs. Restore the previous behavior and return -EINVAL instead. Fixes: 83c8e3df642f ("gpio: aggregator: expose aggregator created via legacy sysfs to configfs") Signed-off-by: Dan Carpenter Acked-by: Koichiro Den Link: https://lore.kernel.org/r/9dcd5fda7a3819e896d9eee4156e7c46c9a64595.1744452787.git.dan.carpenter@linaro.org Signed-off-by: Bartosz Golaszewski (cherry picked from commit db1baf69e563fc222a75c0add5c76f437c717ac0 gpio/for-next) Signed-off-by: Koichiro Den --- drivers/gpio/gpio-aggregator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c index b31dfcfeb074..da6cf09cea8e 100644 --- a/drivers/gpio/gpio-aggregator.c +++ b/drivers/gpio/gpio-aggregator.c @@ -1115,6 +1115,7 @@ static int aggr_parse(struct gpio_aggregator *aggr) if (!n) { pr_err("No GPIOs specified\n"); + error = -EINVAL; goto err; } From patchwork Tue Apr 15 06:13:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koichiro Den X-Patchwork-Id: 2072652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4ZcDQF4p1fz1yMp for ; Tue, 15 Apr 2025 16:14:29 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1u4ZZC-00041z-6j; Tue, 15 Apr 2025 06:14:42 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1u4ZZ9-0003zM-G2 for kernel-team@lists.ubuntu.com; Tue, 15 Apr 2025 06:14:39 +0000 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 2D33B3F1ED for ; Tue, 15 Apr 2025 06:14:39 +0000 (UTC) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-7375e2642b4so3772189b3a.2 for ; Mon, 14 Apr 2025 23:14:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744697677; x=1745302477; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DRcQtiEMUmamY5jsGMSHSA/cOHK6BksTme35Z9u/YH4=; b=OMKqhL14+gnb1D/PMQ7y0mZGZvPITMof4BahSRFIF41rGeru9qGOXo/xshAbbMqNXx 7PvuEria9td5t9B8riLzGjL+ytcH+WhtDEeC0aui5p43XDVePQSkdShMrtY7fRlN2ZCv 8fRTmhGrIel5WewklO6bsUzODQfhJqsv9+P2NOJSkMapuMdsAplMppAsHorosftZm088 CEBi5wxBuhDLOehBePqJvwR3nuZu3WGM1rwP7fWdFRnJcyAkJb4xFKfPjywiTz9Tun2r HfH/KnDDAGKSHFAdyNsdMTeonZKBqIdtosoKpJVZI3C1bd8KxxVtNHWC07lyQOq9vshj 8jlw== X-Gm-Message-State: AOJu0YzyW+EddlzcW6ZxF9D52JjSqmjxLgtx77xO5fFobwuH59e7QjeI BpKxXarFVm3bVrmIbT1721b+EhsmcK2NNmNNTbgK49WvOsqrdipHiO3Txys+MUOZRvvIMWEGvDr hXFNvDwTjkr6aBcGpiw9cUdtNGIm46Kc5FkF8KCqrz8JtwPlRpuBACnE4eYMed05XIGQkQTImRS h78TK1rDKmzg== X-Gm-Gg: ASbGncunBuFNybFK6ITll0A45Z0WL+QVeOBfGSL7OJnoYyufn0R3Ym3HHTg+uxdgOTI BRtmbybcDOpf6FxeFdjqflO8EMguNpthOACYWVAKYamwsULffpl8S1/z2OxeNa4SZVA0DS3Jx8/ DZB8FNLOd8xEOzCBdu1vtkJB39jqpUYuHYjuT6F/2D+Ei5qlHz+c7tF8+4NSyIDGnSWc1yz5+aH UQzTGO1j/IkahSowgjWzjFrsCCDa9jtlohozIQn+7VFgnk/SdUIXfe/l3unqg662MZJoJrbF1VY ZWWvhf9bt1ZymzajXRD+wPE9fMxd+A== X-Received: by 2002:a05:6a21:3181:b0:1fe:90c5:7cfe with SMTP id adf61e73a8af0-201797877b9mr20832647637.6.1744697677664; Mon, 14 Apr 2025 23:14:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaIyqrvfb3OC+gLNuin8e0QtQnCt1cfKmxSYCxrhfiZEAWX2T/nAKSk2/tLWyIMw7fzcZorQ== X-Received: by 2002:a05:6a21:3181:b0:1fe:90c5:7cfe with SMTP id adf61e73a8af0-201797877b9mr20832632637.6.1744697677306; Mon, 14 Apr 2025 23:14:37 -0700 (PDT) Received: from localhost.localdomain ([240f:74:7be:1:a31c:d1db:5e23:e8fb]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd230ddaasm7909286b3a.138.2025.04.14.23.14.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 23:14:37 -0700 (PDT) From: Koichiro Den To: kernel-team@lists.ubuntu.com Subject: [SRU][P][PATCH v2 4/6] UBUNTU: SAUCE: gpio: aggregator: Fix error code in gpio_aggregator_activate() Date: Tue, 15 Apr 2025 15:13:23 +0900 Message-ID: <998d535919806ab06ebbad5ee95ec4a8c4d595d2.1744694723.git.koichiro.den@canonical.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: <174469458477.3554672.3738856905360736202@z790sl> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dan Carpenter BugLink: https://bugs.launchpad.net/bugs/2103496 Propagate the error code if gpio_aggregator_make_device_sw_node() fails. Don't return success. Fixes: 86f162e73d2d ("gpio: aggregator: introduce basic configfs interface") Signed-off-by: Dan Carpenter Acked-by: Koichiro Den Link: https://lore.kernel.org/r/79b804a0769a434698616bebedacc0e5d5605fdc.1744452787.git.dan.carpenter@linaro.org Signed-off-by: Bartosz Golaszewski (backported from commit 05b43de95add3d787a7a88378086bf01c10b3f40 gpio/for-next) [koichiroden: adjusted context because Plucky already includes v6 patch series, where relevant functions naming differs from v7] Signed-off-by: Koichiro Den --- drivers/gpio/gpio-aggregator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c index da6cf09cea8e..59c6df69faa7 100644 --- a/drivers/gpio/gpio-aggregator.c +++ b/drivers/gpio/gpio-aggregator.c @@ -615,8 +615,10 @@ static int aggr_activate(struct gpio_aggregator *aggr) return -ENOMEM; swnode = aggr_make_device_swnode(aggr); - if (IS_ERR(swnode)) + if (IS_ERR(swnode)) { + ret = PTR_ERR(swnode); goto err_remove_lookups; + } memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo.name = DRV_NAME; From patchwork Tue Apr 15 06:13:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koichiro Den X-Patchwork-Id: 2072653 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4ZcDQG2qY5z1yJ9 for ; Tue, 15 Apr 2025 16:14:30 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1u4ZZC-00043J-RL; Tue, 15 Apr 2025 06:14:42 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1u4ZZA-000408-Ri for kernel-team@lists.ubuntu.com; Tue, 15 Apr 2025 06:14:40 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 8F42F3F1E4 for ; Tue, 15 Apr 2025 06:14:40 +0000 (UTC) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2240a960f9cso47200225ad.0 for ; Mon, 14 Apr 2025 23:14:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744697679; x=1745302479; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X2DUZz1mSaPVkuvdKnggRy6ZpxjlV8TGvnoBXWwjC2Y=; b=whMmYnTgC8ZtzA+/uxb2rFyAuJ9tze5zSOMGHlQCXloG9p6oizMtltYBflyCKS3ITh eyPeAaDvmZCZADb1tsH2eIuZIBGjt50EqeOi1k0CsVAxZF9O6pjsA8yytIzm5aMBOVRg snPj8M8gS3FtzOhhCyvLcvZQ/X/sAOV1AnwQLcNJvZem4JgCc4Fgw3mkAkgR4umr2vzR xe1R7GzWXugih/2YQ5Nf+/aHikSf26i7H55v/VG4X4jt0Tzjk1QGMYO0QoFm+7bYLYGP uxAI25eskarOpgp3vhKM4ZEfKIKs5EXEWg2RyywxSJGeGWxDZCk2k8WiDvnhV2yK2LC9 5AuA== X-Gm-Message-State: AOJu0Ywrpcq9Hyr2a2quVk5OA6lUcr6Gu12sDyTJhwejloTcbjGNPagG Ddlg6ePtx63ZlJSb4WP+5q31vA9vhde/4SNrBjHn4sR0/JRzuHH9sLUPeGuCXxcbH/PYMBwPcm+ 0y4k79UsSQiCsh4gGT9oFugc7C6KDsqVJ2E712qcMlgQNRuGJuyThOQf0+N6Y5c9cWlqAI3Gxdm LtrCHLmgAPmA== X-Gm-Gg: ASbGncvXUh+toufXaHHvGdN052ooFFMSieQLrmJg+1sm6OQUxqrVUAeFVg0Fu55jddv 9tRfqYPNB/8ihIwZS52fsFyV9ZjWJqgJOE5HdydsQDHkcP78AQChgXu0VOhWAM6FtxbqfkJ5hpK UOr5JQkZK7dpWzWkDOkVGKo42YZa03bpateOYXem+ZLuTe1pLyIjLmOZWK2rXx0euAcPcFSuP2q 3gXelOrs94uKFtbH07GM3YFfjylWcp//ZXIPXgAaSeIrwimHX03eLFJRxOjPx5MXqmPGknETzHT a6lygLNhjqJ66CkvQuWMOwT4lfW+NQ== X-Received: by 2002:a17:903:32cb:b0:220:d909:1734 with SMTP id d9443c01a7336-22bea4adeaemr204865665ad.14.1744697679004; Mon, 14 Apr 2025 23:14:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5QfKp65AlPyV/wFTwzeWIhbDXDPnfPFE77Dmur4+5wjUVanrJkmTI5aEsH346Es8uluv3QQ== X-Received: by 2002:a17:903:32cb:b0:220:d909:1734 with SMTP id d9443c01a7336-22bea4adeaemr204865445ad.14.1744697678654; Mon, 14 Apr 2025 23:14:38 -0700 (PDT) Received: from localhost.localdomain ([240f:74:7be:1:a31c:d1db:5e23:e8fb]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd230ddaasm7909286b3a.138.2025.04.14.23.14.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 23:14:38 -0700 (PDT) From: Koichiro Den To: kernel-team@lists.ubuntu.com Subject: [SRU][P][PATCH v2 5/6] UBUNTU: SAUCE: gpio: aggregator: Fix leak in gpio_aggregator_parse() Date: Tue, 15 Apr 2025 15:13:24 +0900 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: <174469458477.3554672.3738856905360736202@z790sl> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dan Carpenter BugLink: https://bugs.launchpad.net/bugs/2103496 Call gpio_aggregator_free_lines() before returning on this error path. Fixes: 83c8e3df642f ("gpio: aggregator: expose aggregator created via legacy sysfs to configfs") Signed-off-by: Dan Carpenter Acked-by: Koichiro Den Link: https://lore.kernel.org/r/e023bfe52509ce1bef6209ec7c47e99279c551dd.1744452787.git.dan.carpenter@linaro.org Signed-off-by: Bartosz Golaszewski (cherry picked from commit d945ff52642d98eb6fa191f88a9cfde729129395 gpio/for-next) Signed-off-by: Koichiro Den --- drivers/gpio/gpio-aggregator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c index 59c6df69faa7..27eaf2c7b95b 100644 --- a/drivers/gpio/gpio-aggregator.c +++ b/drivers/gpio/gpio-aggregator.c @@ -1088,7 +1088,7 @@ static int aggr_parse(struct gpio_aggregator *aggr) error = bitmap_parselist(offsets, bitmap, AGGREGATOR_MAX_GPIOS); if (error) { pr_err("Cannot parse %s: %d\n", offsets, error); - return error; + goto err; } for_each_set_bit(i, bitmap, AGGREGATOR_MAX_GPIOS) { From patchwork Tue Apr 15 06:13:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koichiro Den X-Patchwork-Id: 2072656 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4ZcDQH5H8Jz1yJ9 for ; Tue, 15 Apr 2025 16:14:31 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1u4ZZE-000460-D2; Tue, 15 Apr 2025 06:14:44 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1u4ZZC-000428-As for kernel-team@lists.ubuntu.com; Tue, 15 Apr 2025 06:14:42 +0000 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id E31053F091 for ; Tue, 15 Apr 2025 06:14:41 +0000 (UTC) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-739071bdf2eso3577101b3a.2 for ; Mon, 14 Apr 2025 23:14:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744697680; x=1745302480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JLP1CjVkmPz/FlR7hyVMTN7gM21HSw9cJrWdfMsG6ro=; b=GEV6aie0Zt44wj7ZI/XQQN67kc4YVN4356p2noB2CBQNCVAmU9ujFcsv4BW9lTJl5H lJ+9uQFPyEhbWo6k4y+3ZZcyrwlSIYKH2sMEVHT1IhuHqhUzvu+WwddfTSa4HnqS5dGy aHIBti99oT11+nuinBmFUz60HsBwFUUi8gD4Z0BIXYZssasPvlPrNnznQ5tpTfl0/Woz MMfFDvod2D3cI3ryXnlPvsz05X6GztG29tx2VdsBdCttMjYIc+4u6vItrBFJvpWOpEPJ 1mtF3chnvQBngbTeMoXUBuh7mJ32alLtZ2Vti7kedUpkasJmUWzjKz9fRuU4+rAM2ABD /0FA== X-Gm-Message-State: AOJu0Yz/8IwYVajZnR03weXm6eD5Q/GdYQNCPN9luupwxj5H47fgv0Fu 3ocV2Hsug8XmV1g+TwYaKFCnnlXhJ1DLksx8yfOzn0eqIhcaCv3GimsgGwJkuG/gvVPkp5u2uvK slghi7K7uPAJT+Lefp/z+CwM3i8/sd2tHR4Qpwoleu7UtbPIwXfdqXVVcNDHLOCYJ6ZnXBgZsUN eGmyPxADKylg== X-Gm-Gg: ASbGncs/MJccHdJFklju/r+6w2uoFPwgH3SyUVGxe/M9dJ79TQpazCdEsT8dZ4ngpBp 4LAWgosSIXnqI4Sw4sHFcSpwqWZXRuqsbqgD2V6yJtSQDem9CSlir1tMkSLuz5/lFZWZsEuWMML k2kJynG9qLtf5Ke6h5kfFmtmGZMFOJbaxb3uEI/mArkUBQHkJfZZRZt9YgC5yp6ozGNR0o0EpOX qy7sfdMdKAcZPlugoMOLV++ZqggOzXP9lFDN67TFRD+lyIKVaMLWmXU7BFUBJYsi9xaATbwI5vi fCDcbAztVUwkTXrHPvaJabGAQIoGBA== X-Received: by 2002:a05:6a00:80b:b0:736:755b:8317 with SMTP id d2e1a72fcca58-73bd12ab606mr19312429b3a.21.1744697680306; Mon, 14 Apr 2025 23:14:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF81ui2NhmE8kHO88PCHjGbstWR8QbG0Dbn6rzzFw7S9XkK349tTGTN07p9565HiNiCzFqAmA== X-Received: by 2002:a05:6a00:80b:b0:736:755b:8317 with SMTP id d2e1a72fcca58-73bd12ab606mr19312404b3a.21.1744697679910; Mon, 14 Apr 2025 23:14:39 -0700 (PDT) Received: from localhost.localdomain ([240f:74:7be:1:a31c:d1db:5e23:e8fb]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd230ddaasm7909286b3a.138.2025.04.14.23.14.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 23:14:39 -0700 (PDT) From: Koichiro Den To: kernel-team@lists.ubuntu.com Subject: [SRU][P][PATCH v2 6/6] UBUNTU: SAUCE: selftests: gpio: gpio-aggregator: add a test case for _sysfs prefix reservation Date: Tue, 15 Apr 2025 15:13:25 +0900 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: <174469458477.3554672.3738856905360736202@z790sl> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2103496 The kernel doc for gpio-aggregator configfs interface, which was recently added, states that users should not be able to create an aggregator with a name prefixed by "_sysfs" via configfs. However, it was found that this guard does not function as expected (thanks to Dan Carpenter for identifying and fixing the issue). Add a test case to verify the guard. Signed-off-by: Koichiro Den Link: https://lore.kernel.org/r/20250412150119.1461023-1-koichiro.den@canonical.com Signed-off-by: Bartosz Golaszewski (cherry picked from commit 290ffcfe3042dcd5b701a98edd48d7962d35556b gpio/for-next) Signed-off-by: Koichiro Den --- tools/testing/selftests/gpio/gpio-aggregator.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/gpio/gpio-aggregator.sh b/tools/testing/selftests/gpio/gpio-aggregator.sh index f1bab62c4cd2..9b6f80ad9f8a 100755 --- a/tools/testing/selftests/gpio/gpio-aggregator.sh +++ b/tools/testing/selftests/gpio/gpio-aggregator.sh @@ -335,6 +335,10 @@ test "$(cat "$CONFIGFS_AGG_DIR/agg0/live")" = 0 || \ agg_remove_line agg0 line0 agg_remove_chip agg0 +echo "1.1.6. Can't instantiate a chip with _sysfs prefix" +mkdir "$CONFIGFS_AGG_DIR/_sysfs" 2> /dev/null && fail "chip _sysfs unexpectedly created" +mkdir "$CONFIGFS_AGG_DIR/_sysfs.foo" 2> /dev/null && fail "chip _sysfs.foo unexpectedly created" + echo "1.2. Creation/deletion via sysfs" echo "1.2.1. Minimum creation/deletion"