]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
driver core: bus: Return -EIO instead of 0 when show/store invalid bus attribute
authorZijun Hu <quic_zijuhu@quicinc.com>
Wed, 24 Jul 2024 13:54:48 +0000 (21:54 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2024 13:11:52 +0000 (15:11 +0200)
[ 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 <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20240724-bus_fix-v2-1-5adbafc698fb@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/base/bus.c

index d171535fc18f55c7c79c9f7919d5c2cfc9fd34d5..548291d15c2906d4f9a820225acc907bf677d22f 100644 (file)
@@ -104,7 +104,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);
@@ -116,7 +117,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);