]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
software node: Correct a OOB check in software_node_get_reference_args()
authorZijun Hu <quic_zijuhu@quicinc.com>
Mon, 14 Apr 2025 11:36:52 +0000 (19:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 15 Apr 2025 16:24:16 +0000 (18:24 +0200)
software_node_get_reference_args() wants to get @index-th element, so
the property value requires at least '(index + 1) * sizeof(*ref)' bytes
but that can not be guaranteed by current OOB check, and may cause OOB
for malformed property.

Fix by using as OOB check '((index + 1) * sizeof(*ref) > prop->length)'.

Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20250414-fix_swnode-v2-1-9c9e6ae11eab@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/swnode.c

index b1726a3515f6fbe13c2186af1f74479263798e42..22bed2d35b2e89b6ac741c73b0190dfe67b35f71 100644 (file)
@@ -529,7 +529,7 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,
        if (prop->is_inline)
                return -EINVAL;
 
-       if (index * sizeof(*ref) >= prop->length)
+       if ((index + 1) * sizeof(*ref) > prop->length)
                return -ENOENT;
 
        ref_array = prop->pointer;