From patchwork Tue Feb 25 11:56:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 868644 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 56343267B0E for ; Tue, 25 Feb 2025 11:56:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740484592; cv=none; b=s9iZngmWIOWNjV8cftTK0SYOa9Pt07EG52z9S6YbYkx9S2+5DAxmayZw1y9onUZVZqE+OfPgQnURtA+1DFc5sJkWcAbgR6sSWupi9P5OZEXvgk2W3U3JD8hznUM4VXA+rlb2i8q1PcVmDHgFcSkKHrPaCiIfuWYiy55t9WDcFaw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740484592; c=relaxed/simple; bh=QFjKRqG4GcDcIpdsMxSuX9xb92DK41K4Tw396/87/wc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UGfphlAx6oyDTRk8Cyk1MvMDNX1Pn1EpEWY9G+3SRlFfWFK4WG9wmMDXamBB/7lyXgvDNhIyzkdHtXfqDcy0k2Vo2POa2HdXivyCZsOGVJZylcWAFRf1PF5Avvf2XwN/cVBeVVrIacT4i7I24dj9Q+ok3T7BQdjuk7of77H4jac= 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=I+n47+a2; arc=none smtp.client-ip=209.85.221.41 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="I+n47+a2" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-38f31f7732dso3336053f8f.1 for ; Tue, 25 Feb 2025 03:56:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1740484588; x=1741089388; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=LvpBsM7jkGs9loJFTKsRmaNNOCTajLtk5qsmtO2+mCk=; b=I+n47+a2SnpV1xbWP4k6/afM54f+Hg/Ogfr6DrRmj93bDwt4w0w3sSi7OkS0xLUET3 GhADtvI/vjCUwAO/RON5bldQSna2M1HraUQaVsBvOZ2LSrYcoWtl4wKFrL8ZVQqrOpLH Ru2LfmPQrL47NwEcl9qtULLvcDGvVEtGQaRJY6rjvRdwzpEs8/8V5OiO2m0g21CiHavZ Yc17eQqJyGy8xC7DJjNW5/fDmi1eJRSGMGx+vUyU0znw3LU4TsQITmGbM43SdAogN8QK LtwOfJMDEKc4Iu0vkS1dugcWXSQ8eZGm3XmoHJvc6ZRCHroWHjvltU2yBFM9hcgfs5vE p5fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740484588; x=1741089388; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LvpBsM7jkGs9loJFTKsRmaNNOCTajLtk5qsmtO2+mCk=; b=Cznha7k5D9Fo+H7QyL5AeRuvDXzck6ByjJzJjWv7vQbpKv+ROJID61fpCJhREeBLy6 /XiEakLzH0Q+GpQJj/2hqw/4r0zmJ4HOBwIpSFY6Vvb611YX+zawtGMFg6Hfs5XIZhkM 4dEt1/zMSaaRHFSamFmajP6+MEjzztO/aCUlbI3MhDrcyRbungxFV4LbTaAxjgnr/SiJ pG/92RmL05YTWajERkQa0iLnZiShS675NavgQXlfNn3rdbqwV9SObZhVo6j/M6W5OZFk KJh8sPRX+uC07PhsLP155y/k8r0Tke0bKDtROro7/BaYlT9FUFQu9yQLUbb5ir2GJSgj y5SQ== X-Gm-Message-State: AOJu0YwjJcOtDOin93iunrYISHzFsjmBjoQd2BD/Gp7wqBdQYsCDZ4nx 1peqvZECO/zHGftH14Ogr058j1+KmvOJfVrqzDYYxwJqVxKJGwVC1gq6PUjviQg= X-Gm-Gg: ASbGncuT6HMgz+NdHdOmTDQFekObHjwnlQyGKN0oo+a3Md+h7K4xmgHEqSOulvZNLdw 32L1s8a1ovyxVNFwGpvuQjNU9AoxCBkq7LWP8sHgngLH7tNv7ZqXCUYa0i3Y7Y5hkQZVVOJpYIR 8XZUOvOztFHxxUcYR5FOC0wKWU7T6DphDrwj6AmyFTbG5lJnPzmtjC3wNlx0sHZMobNEkH9XNQ9 9+VVj3KdGwzmQZGxC5xeL0tHIA5oNCiQgXnGyWAN1UyCGOwGRHYXzit99L9enlgY27eiACYp3q9 vSz0GooJuMH8TBt2AT4= X-Google-Smtp-Source: AGHT+IFbHW/dPK4ftZzO7Ek+FUgxyf17HZKH0QZnDUxYZyX57DqZlOG/jTA+jcKaz1zW6hZq1nbk7A== X-Received: by 2002:a5d:6d82:0:b0:38a:4184:14ec with SMTP id ffacd0b85a97d-38f6f3c507amr13574796f8f.1.1740484588550; Tue, 25 Feb 2025 03:56:28 -0800 (PST) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:15ae:2cfe:447a:4a32]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd883521sm2058054f8f.56.2025.02.25.03.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 03:56:27 -0800 (PST) From: Bartosz Golaszewski Date: Tue, 25 Feb 2025 12:56:23 +0100 Subject: [PATCH 1/3] gpiolib: don't use gpiochip_get_direction() when registering a chip Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-retval-fixes-v1-1-078c4c98517a@linaro.org> References: <20250225-retval-fixes-v1-0-078c4c98517a@linaro.org> In-Reply-To: <20250225-retval-fixes-v1-0-078c4c98517a@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Marek Szyprowski , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2174; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=+tTnhMWB//FVOHJTSSpSmVpKtdDSpnz0c6diDmew/A8=; b=owEBbAKT/ZANAwAKARGnLqAUcddyAcsmYgBnva/qaE2yAUg2nPQ80bDPUYDWPfZhWOnHAN7pY qlm6r0nnwOJAjIEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCZ72v6gAKCRARpy6gFHHX cibLD/iHExBqkQIeiKBOZG4VnNjIxs1YVEE5mdFb/S3iCX1FqQOQGf0RtYlmobHe+qDPsOffAi9 vHyen5ZPfHRTH23hlXv3q3Ws7u9JYWqiHxe6GoyVingpQQBql7/QaFTp/KP2iKNtis40gYBD2de tqroqif9wuyf/oD+vzVWtoiq57V3GiyBumXrMyDE4PEEaTGjGfxxy/Gq54y9EjnnckJ65evQ9Dw LTuxE9zJyIU8+GTeBQad7NRUVjixItxOOpVFYKyMj6rbW6Itj2gD01oICXtoEWixRvRv/Cd1MMp B+wIGv/jM7g8WrhEBITkWGU3/03IYK3nQ8cgqgsIxDuSpyMnStL/WKOgaSXzvZubbTLxOSmTKyJ FrZS+hfKiOULzvU+KtC8lCS75o6LSjwmWd4S4nVGLHb313LaGVW907oO2sxqGb4D1wY88WAaIOp 6kI+Za0ln38bz4hj1Mo6BS9Db0AQGhq7sF5MXaBQg293Xzfen+M4c9mYtHDGVYC938WtybdwIYx qYICftwel4MTJH1r1jyZlmkJ/8NX9FAqqPD81XcKu8GizZ++rBabxHz/5YPrRNUvjlZkpk8kI45 IzlIE7FmL5xgBKq3kOprkFxelmyGxe9EftM1PBE5g102P/q0bBwUO9FesfvimS9X8YwiySHJgrf 9QxxPojpa1yRc X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski During chip registration we should neither check the return value of gc->get_direction() nor hold the SRCU lock when calling it. The former is because pin controllers may have pins set to alternate functions and return errors from their get_direction() callbacks. That's alright - we should default to the safe INPUT state and not bail-out. The latter is not needed because we haven't registered the chip yet so there's nothing to protect against dynamic removal. In fact: we currently hit a lockdep splat. Revert to calling the gc->get_direction() callback directly not not checking its value. Fixes: 9d846b1aebbe ("gpiolib: check the return value of gpio_chip::get_direction()") Fixes: e623c4303ed1 ("gpiolib: sanitize the return value of gpio_chip::get_direction()") Reported-by: Marek Szyprowski Closes: https://lore.kernel.org/all/81f890fc-6688-42f0-9756-567efc8bb97a@samsung.com/ Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpiolib.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index e8678a6c82ea..31d400b10167 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1082,24 +1082,12 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, desc->gdev = gdev; - if (gc->get_direction && gpiochip_line_is_valid(gc, desc_index)) { - ret = gpiochip_get_direction(gc, desc_index); - if (ret < 0) - /* - * FIXME: Bail-out here once all GPIO drivers - * are updated to not return errors in - * situations that can be considered normal - * operation. - */ - dev_warn(&gdev->dev, - "%s: get_direction failed: %d\n", - __func__, ret); - - assign_bit(FLAG_IS_OUT, &desc->flags, !ret); - } else { + if (gc->get_direction && gpiochip_line_is_valid(gc, desc_index)) + assign_bit(FLAG_IS_OUT, &desc->flags, + !gc->get_direction(gc, desc_index)); + else assign_bit(FLAG_IS_OUT, &desc->flags, !gc->direction_input); - } } ret = of_gpiochip_add(gc); From patchwork Tue Feb 25 11:56:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 868279 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 5BF1D267F5F for ; Tue, 25 Feb 2025 11:56:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740484594; cv=none; b=TouDkw1H+X6/vZ16a09EFh7ofNuuwz5AHMj6gMMUS7M6bG9xn5Fp60XsQ1gWT805pHRtRieF7GP7MYu+fUdJsw6kh1x4EMi3C8r6KhWWYXRnj+n7RQ5/cUSL4wkqv5H+uQ3Xj7gCUYuIs1gAqPuJSske3jZ+4ktG2PKB4tkwA1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740484594; c=relaxed/simple; bh=YGO460ES0PrvtUVk1u55ClcB0fzrhT+lCjeLiVsXEQ0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FG7s7mDpSbhTAI+wSDfxSunHGin1VIVwQbSi1H8afKCApGga4wkv+2SYTplWoBXEoNzHBDkOIqtnXLRk5qSqmCs/8bhl91TiATESiQjUq4LivFKysdHBwbEeoOcI7kLUUEdiclOEa5o14VAjd/MTiCYJZKNCq+t9ubd0U5cMvRk= 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=f4e6axpg; arc=none smtp.client-ip=209.85.128.54 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="f4e6axpg" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4397dff185fso47988835e9.2 for ; Tue, 25 Feb 2025 03:56:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1740484589; x=1741089389; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=gbyzciQhn2JO10NIz132GUVY7KJkuW4I/yRQ2WvjRfY=; b=f4e6axpgyyc1ihcz97Cu+t1QIeJP89fNksN/ISLQSWR3Enj6BXHeEVvF22PjPaQ3bW jz0Wvyv4mmh7wA4d0P/Lk0ha2eqypnSW7lr4EYyNKtd5Ol3VWvAPCslE8jqLZBnO9Krw WghoPPBtFCY8KnJkwY0F/bB9HMoXFHkjhKje6cuaw1B1VUX7BChoQhoPO3Lsn3MLKPCR 9a48hIR80VDnqZ+M+HOD21PORDZnHCSJbch8+676YUqkGvFgplQ8+gOgrAGPL+ZsUITF pxSjoEZLLeM/sz255gcm/QRk4Ho/cHgs2TxABr4RRG+zxKKiUuu2g+jP+42bH78BmAip F39A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740484589; x=1741089389; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gbyzciQhn2JO10NIz132GUVY7KJkuW4I/yRQ2WvjRfY=; b=HjWimh1Px3YW9x6wfOo/+CD+pEfEyAQAeTkW0tEv1WWDlZGt3chhJ3BA/0LDFNtsIh 8qmVmzkv0akPrqUUgJWIDnjpjFQ3KZ6NtZi6+wws7ur+FyiZ+2eL8h6trWpXUf7TLdKx xgXLN5JfSLn3iNI97vMxsRAlMiLswD4d+r/j5FFiAhsRVrkfe9pEo2eWQ4PQIM0THSO5 zCTFTmey8goUCs8Pi0s67IJBy0Ak5ZEg//vkXdP6WgoDBHaV0OADDKqcnQwN6n2HZek2 zYyQIa3leQL5Im6GK2CdT6cVTlndi5xrGkSFT7bFYK9UkM4ZwOuQm7sCVrHNiqc3b1a9 qHPw== X-Gm-Message-State: AOJu0Yxmlhu5gl7VBNyvpjoQMHuKggYX7Z8575U9MRwV94CthS4M4ia8 qL11j72Hz42a0Eq9O4++CzW3PS67IkQHsNUj2iaJfG1VFChfKm05+u6MhTLsFHlQ2hARWIvO5kz PTyU= X-Gm-Gg: ASbGncvDszC/8I3T/twdiWOs4wyPgAX9n4G/SN4U10qVvjqGd5z12bMe3am0fXBjR0p r3ZUEBcWApGCFJjdUnquTqQCo0khO9JcnIczO392kDpVJP2QWJuRR7CQEA1TwT37mhnlm+/iP3B 8QcMedJDRmYJPPat0PeltZcSi46e9IYSwmppBKg9OATSZGnjYEzd8eaG8lco8jTFaVmoyzsg1Yg CpdQmaQ0oL2x74FoHKFhFVwfCnuwhyRbgkRos0mR+1WvJ6ghOkT7wQB+613Bvxmo/ESehq8BkGX HLtSgM2YLAEz9cTgD8s= X-Google-Smtp-Source: AGHT+IHIzmnFe0wL3bd+qPFKv1f1nRGmaxVMrfrzshY6OWhKyRxO+hXZl+5icJa2+TqYCYcjMQncEQ== X-Received: by 2002:a05:600c:3b1e:b0:439:6ab6:5d45 with SMTP id 5b1f17b1804b1-439ae221161mr132196715e9.28.1740484589543; Tue, 25 Feb 2025 03:56:29 -0800 (PST) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:15ae:2cfe:447a:4a32]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd883521sm2058054f8f.56.2025.02.25.03.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 03:56:28 -0800 (PST) From: Bartosz Golaszewski Date: Tue, 25 Feb 2025 12:56:24 +0100 Subject: [PATCH 2/3] gpiolib: use a more explicit retval logic in gpiochip_get_direction() Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-retval-fixes-v1-2-078c4c98517a@linaro.org> References: <20250225-retval-fixes-v1-0-078c4c98517a@linaro.org> In-Reply-To: <20250225-retval-fixes-v1-0-078c4c98517a@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Marek Szyprowski , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1126; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=NnHAWuzH40cQuDNG1I+t5WrVKSbiDQg/68nmaoJKiis=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBnva/qIPZJ84lRhkSMi0g4Z1k1dJJa5Jn9etdFV Uf6uxDR3yGJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCZ72v6gAKCRARpy6gFHHX ckpdD/4pwb5HoTcNJ2VQB2wPyjduGOYeH1LSwH17WtzrY7fh+XppIilM6adtRhSwEVv1eOl9fs5 +JcSMJYgFuHXoodypkmoXEeIyDuU6PgRpLLPe7lg6tZsy1+Rpv4YGIb8koBfORqXbi2wxf/FaaL 3K3m4B88NcOEogs1yuCyHtUHpGAC97+vHqqI7sab+P4jSyMLUf9xNyHVUQ3QBoJeQeWQp5X+l/s qYp74TtILFgmwLeQzF4Sofoy30uzOkrA+nET+ecHYmqPVDvPou/eDw2fJZOmtsiRdTCVj6z1FoS m1QvjZQC1+DhZae11jdybkzzcg/KsxbWAPPidT6jOiJ1UiaPVEr9q0H7hnZHaULe5iMqhSDSU7P gKIKfCyN5RD+qlh6ai0FAeCc7yLFTf4L0X5uDrbvAGnLsdjWYZDmJTHqyURngSm1HU/7u/1OG10 COz6DcqxuSBvrUkQfpb1vbCeofUqSZqT7jAQ6gWIP3Iv1iEZAGktNgOj8+dEycftiM87dD2hnBX x1j6jOFsBzQGvMmMliB4hrUvQ3wmxKoLUUlj+kO5hXivSisviKbv02M7hzhow2WQPlo8pDKMJ0U STSkMsRstM+xEZajyuKVDMOwKqnSZINZcQ/ljmcS4uwxlDp4LoWj/kOhC5/nTCS5QFOb2vLL5/D B44aGoQdL2xto/Q== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski We have existing macros for direction settings so we don't need to rely on the magic value of 1 in the retval check. Use readable logic that explicitly says we expect INPUT, OUTPUT or a negative errno and nothing else in gpiochip_get_direction(). Fixes: e623c4303ed1 ("gpiolib: sanitize the return value of gpio_chip::get_direction()") Suggested-by: Andy Shevchenko Closes: https://lore.kernel.org/all/Z7yfTggRrk3K6srs@black.fi.intel.com/ Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpiolib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 31d400b10167..d076b2ec633f 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -352,7 +352,8 @@ static int gpiochip_get_direction(struct gpio_chip *gc, unsigned int offset) return -EOPNOTSUPP; ret = gc->get_direction(gc, offset); - if (ret > 1) + if (!(ret == GPIO_LINE_DIRECTION_OUT || + ret == GPIO_LINE_DIRECTION_IN || ret < 0)) ret = -EBADE; return ret; From patchwork Tue Feb 25 11:56:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 868643 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 707AB267F57 for ; Tue, 25 Feb 2025 11:56:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740484594; cv=none; b=i9HdfmiYSJfKi+wjRm67w6x+CXibfJ0G30wYjL8BtLsq52zP/73oQPEcPlXdKHY/Wm9DOPHOgTPkqFTTXPj1KdeAIKsgLbjaYf7g0KxacaJexmiOkbNch6jHGQgyXS9OXEoFbUYoi4NU45fqhCYB/jHEhi2ho8GVMytqhNgLCmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740484594; c=relaxed/simple; bh=Mti7N7TampMJEA85fEFqM/SWyPHekb4T8hMC5Q9KEIc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Nr0rnkwwSF5M+YbeRNXKBw1OrVvenH1bySIMu/WTbHsGZbKxIbMYNp7pj48u+e0ypM8ahDBz26QWLJvdUsgf8F3GT7/YC6v+3++/U2CmXuWCvprag83+5eExPMPsMwSM90RQRjNL6tkxNeNMVZHsdeu7vpSI66U7e9N4tg3bZPQ= 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=KwSkPt55; arc=none smtp.client-ip=209.85.221.54 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="KwSkPt55" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-38f325ddbc2so3988481f8f.1 for ; Tue, 25 Feb 2025 03:56:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1740484590; x=1741089390; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=9VXUEb/ixDS8VUxbNTLQP4mnGoLEwCu+P5iIlLIClao=; b=KwSkPt55zD8GpgiTHELk3OCn6SOVqmR0IowNtdRHohS1Uz4l8Vbr6V9s721KB+VJ7j /J3xkEYWda7X0jRevxqYr3yb50HqF6EgpOa+SMQRdFNQDUWjLqAiOAlIhs3SNuEPQPQe fx89DKthg+lpayiVwf6k8z1KcNOZc1j2Coh+OomI4Ya8Za+cnjD6nId88QSN7eU9jXLM weACdEqBew5y3/+BB+tHJPsqI2CijFvhrzOqUn7gHF0ouNYIVmPfqm4BAsSS2ypx8WLX R7hzaUfHv+Z5sj6f5dPTg0aQVXutORkfHlZkM9e9QStafrGykvuSZNgbTwD1GVZ5VtDc z4/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740484590; x=1741089390; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9VXUEb/ixDS8VUxbNTLQP4mnGoLEwCu+P5iIlLIClao=; b=T3HG3KNGQVh9RbHmUyDLKhnxflkwGAi5QSERyHWRhDNbCJVyzmsBjGVO0W3aoT3oXZ UZ7obY+DLY6ih/EnduuOPwZ9URfiiEgsoKc/CIrCclLINhCas9JV+Uc306vi2JL3dM84 ODfBdyKjhEglLgrmYVsDlrLugnhE5v3VJTHZ3Z+goe/IOWJQZnQbcSS/b1TG+qdX2J8L /SbVdKrR7lhP8yApokQyY+cHxrgDHePVrgteH2jMF7kQxuZrBTj0nX1f1pYgmgSqeCv5 QfBn1Q40Zanex1kYwwiNpTN23NgR7/YhyVmgHpmxESFGe5Xn5CHMEtgIuxiacPpaPTag KXGw== X-Gm-Message-State: AOJu0YxVdeJAKIZsKws+QVB7AOSbBH5L0uf/KhOE9jjmWWrRxtQVOt1d N7JEG1qDbv8BuWQ0fnvMnRPlY/rKq1j3Yquky2UezGh7+5Ww2ji+DtcI+wanzts= X-Gm-Gg: ASbGncvmEUVfM0sn8nORv+DNwAn0z2ZeP7nzfZzeyojah+hPwgFjNiQY99NAYgTZ36G xH4OQHLOltBI+pGL+j+QWLmkmGAYZkQVll9Ev7bflF+HOaLtQGe6y8wJplRjPCtPm5DFn4I67Rt Lv+u6cJo0eWqWK/4Qze7wI+yrCA76eSYfEXAoIwsBtsNT75MAo/fMoI3wFULJbQZMJmFgLHTcA9 UUpM74RfKA1zpqhe7EioBL0VJwWxOeTB7os4TdVYVH5MUmr/Vc4Z1I9Czzn25ZXpL+uvBSfvYrA IN9sRH5Rd5VHyVm7gqQ= X-Google-Smtp-Source: AGHT+IGhNAzd0cwvKJlCcUBz4fFnTGPxFvxtGsmUDBHWAvkZ/S5MMekNH4MM1kJfOrBEzZienQf0IA== X-Received: by 2002:a05:6000:186e:b0:38d:e572:4dc2 with SMTP id ffacd0b85a97d-38f70826839mr16768704f8f.40.1740484590445; Tue, 25 Feb 2025 03:56:30 -0800 (PST) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:15ae:2cfe:447a:4a32]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd883521sm2058054f8f.56.2025.02.25.03.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 03:56:29 -0800 (PST) From: Bartosz Golaszewski Date: Tue, 25 Feb 2025 12:56:25 +0100 Subject: [PATCH 3/3] gpiolib: don't double-check the gc->get callback's existence Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-retval-fixes-v1-3-078c4c98517a@linaro.org> References: <20250225-retval-fixes-v1-0-078c4c98517a@linaro.org> In-Reply-To: <20250225-retval-fixes-v1-0-078c4c98517a@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Marek Szyprowski , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1494; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=6atFFEarXWb+TlxXxAZ8zvN/XwNKSrTyBdSfh9C2z2g=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBnva/q/AmJ17Wymqe4xC7L2pemu0T0vkY2LjS/L 033mY+Bz6uJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCZ72v6gAKCRARpy6gFHHX cqegD/96DdPjR+YM/W3XOgAGfDVn4rpB1amn1VB167231QWyCHnDLZcC1GA0i3dBcu8oLunOygq ud1Yh7DH821xcPFiYkURVHaM/1UWGDkF91NgroW10LLpCzG9QtxczwyRqVn3Iyx82pvjcm6dt+z 5H/KlXAqJDpX5jvHh74if1UQ6z+z4Wk3jYq7CGCbSSWJhgheKUenVFxqnMdOFO4cbXZz8kZ8/tW 9gYBMKLIVhI1wLvVxxxwVRv4AEn4szanmnxSwaR5+oPpzDdOomLNwbmfvzsicjMAfUlmgM6h99E fRYX1DX/jZiORTaZS+zGepDSj0jpcRwzY5I1RmdoC7PUdrkon7XeBxgjuF5nqSCDN7A9EQN9KZY jYhJE8Obxj6o4WIS6IEm1YsD2bcQMpuJhV4XO/+rLHSRQwGVEgBg8E4NWCqCSD/xtgi4FfR+kpJ vkybu+DQLYbPPpA0cnl2btyb4s2b2x9SyA5wUdFz1Wubv0hi8ZtzW6kz3Q2VgYE3qwyct9tdZCA CYGGp6W9+y2BPJAnZ3o8PBGH9BAV5fH/1K0ScP98J8lbjvu+WbwbJg+e6U8dYBrwuCKMXuZU8AU sKnm1nHNyZv/O+p33x0glx437P59HBdzjAaZDcYyHSwX/8bqmUQHEsyNMy8VcpFmoDPiraXAXKN mH9qS4d1LgjjOwQ== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski gpiochip_get() is called only in two places: in gpio_chip_get_value() and in gpiochip_get_multiple() where the existence of the gc->get() callback is already checked. It makes sense to unduplicate the check by moving it one level up the stack. Fixes: 86ef402d805d ("gpiolib: sanitize the return value of gpio_chip::get()") Suggested-by: Andy Shevchenko Closes: https://lore.kernel.org/all/Z7yekJ8uRh8dphKn@black.fi.intel.com/ Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpiolib.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index d076b2ec633f..b8f10192f27e 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -3158,9 +3158,7 @@ static int gpiochip_get(struct gpio_chip *gc, unsigned int offset) lockdep_assert_held(&gc->gpiodev->srcu); - if (!gc->get) - return -EIO; - + /* Make sure this is called after checking for gc->get(). */ ret = gc->get(gc, offset); if (ret > 1) ret = -EBADE; @@ -3170,7 +3168,7 @@ static int gpiochip_get(struct gpio_chip *gc, unsigned int offset) static int gpio_chip_get_value(struct gpio_chip *gc, const struct gpio_desc *desc) { - return gpiochip_get(gc, gpio_chip_hwgpio(desc)); + return gc->get ? gpiochip_get(gc, gpio_chip_hwgpio(desc)) : -EIO; } /* I/O calls are only valid after configuration completed; the relevant