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 639BC1A76A5; Mon, 14 Oct 2024 14:41:57 +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=1728916917; cv=none; b=hU5E0q0P9vi/P0GUpONBh2S6+3MdiwNPF34apfprY5utL5QdZ/4B03K/asXKJgoY3IVrnK7BSt/NAE0U+d8quyAYk/XLaFubW9TPN1zd8FUmprg4OIoUNp1Ee+fakLAM1w+l4E9DGr/hVZWoGAJIv2Oj6185PffS5Pb+VQEMsKA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728916917; c=relaxed/simple; bh=YoYCttugoxuNzJArINEPszTf021PvloiE73O67JihVI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f6hZrKZYpVrz/Ui97FMllhOXG9LiFYPW2R4G/osOgLV3Uh0x6nns/hwHrUg2sxj9397bmdO4OpuFWNlPL7u9LMT01Nf0s6niHemR3ja1XeCpb9z+WgIIXL5shWrnJ6sn/B3Qd8U23M6ir//2TW2Mi6jLbD70OyIxIxhBzRHJ6fQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=b3RxNqW9; 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="b3RxNqW9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BA5CC4CED0; Mon, 14 Oct 2024 14:41:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728916917; bh=YoYCttugoxuNzJArINEPszTf021PvloiE73O67JihVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b3RxNqW95kyDN0B8v+p6eadSUVUld2N4rfuW5eTIKkQjALFAGg/PFkv7dVe550TB4 EA+6zHXh9vnTLu04/CNs4sFaYEVrbQN3SslYTjyjHV89cs7xb3jLrmvqDSDHBla4/T swt09ysRjKUW5SGUupTTpt7aTbEpVhQGD/uFA90k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zijun Hu , Sasha Levin Subject: [PATCH 6.6 100/213] driver core: bus: Return -EIO instead of 0 when show/store invalid bus attribute Date: Mon, 14 Oct 2024 16:20:06 +0200 Message-ID: <20241014141046.873443432@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141042.954319779@linuxfoundation.org> References: <20241014141042.954319779@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zijun Hu [ Upstream commit c0fd973c108cdc22a384854bc4b3e288a9717bb2 ] Return -EIO instead of 0 for below erroneous bus attribute operations: - read a bus attribute without show(). - write a bus attribute without store(). Signed-off-by: Zijun Hu Link: https://lore.kernel.org/r/20240724-bus_fix-v2-1-5adbafc698fb@quicinc.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/base/bus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/base/bus.c b/drivers/base/bus.c index e7761e0ef5a55..d4361ad3b433f 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -152,7 +152,8 @@ static ssize_t bus_attr_show(struct kobject *kobj, struct attribute *attr, { struct bus_attribute *bus_attr = to_bus_attr(attr); struct subsys_private *subsys_priv = to_subsys_private(kobj); - ssize_t ret = 0; + /* return -EIO for reading a bus attribute without show() */ + ssize_t ret = -EIO; if (bus_attr->show) ret = bus_attr->show(subsys_priv->bus, buf); @@ -164,7 +165,8 @@ static ssize_t bus_attr_store(struct kobject *kobj, struct attribute *attr, { struct bus_attribute *bus_attr = to_bus_attr(attr); struct subsys_private *subsys_priv = to_subsys_private(kobj); - ssize_t ret = 0; + /* return -EIO for writing a bus attribute without store() */ + ssize_t ret = -EIO; if (bus_attr->store) ret = bus_attr->store(subsys_priv->bus, buf, count); -- 2.43.0