[PATCH 5.10 123/717] media: v4l2-fwnode: Return -EINVAL for invalid bus-type

[Greg Kroah-Hartman]

From: Lad Prabhakar <prabhakar.mahadev-lad...@bp.renesas.com>

[ Upstream commit 69baf338fc16a4d55c78da8874ce3f06feb38c78 ]

Return -EINVAL if invalid bus-type is detected while parsing endpoints.

Fixes: 26c1126c9b56 ("media: v4l: fwnode: Use media bus type for bus parser 
selection")
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad...@bp.renesas.com>
Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/media/v4l2-core/v4l2-fwnode.c | 6 +++++-
 include/media/v4l2-mediabus.h         | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c 
b/drivers/media/v4l2-core/v4l2-fwnode.c
index d7bbe33840cb4..dfc53d11053fc 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -93,7 +93,7 @@ v4l2_fwnode_bus_type_to_mbus(enum v4l2_fwnode_bus_type type)
        const struct v4l2_fwnode_bus_conv *conv =
                get_v4l2_fwnode_bus_conv_by_fwnode_bus(type);
 
-       return conv ? conv->mbus_type : V4L2_MBUS_UNKNOWN;
+       return conv ? conv->mbus_type : V4L2_MBUS_INVALID;
 }
 
 static const char *
@@ -436,6 +436,10 @@ static int __v4l2_fwnode_endpoint_parse(struct 
fwnode_handle *fwnode,
                 v4l2_fwnode_mbus_type_to_string(vep->bus_type),
                 vep->bus_type);
        mbus_type = v4l2_fwnode_bus_type_to_mbus(bus_type);
+       if (mbus_type == V4L2_MBUS_INVALID) {
+               pr_debug("unsupported bus type %u\n", bus_type);
+               return -EINVAL;
+       }
 
        if (vep->bus_type != V4L2_MBUS_UNKNOWN) {
                if (mbus_type != V4L2_MBUS_UNKNOWN &&
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 59b1de1971142..c20e2dc6d4320 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -103,6 +103,7 @@
  * @V4L2_MBUS_CCP2:    CCP2 (Compact Camera Port 2)
  * @V4L2_MBUS_CSI2_DPHY: MIPI CSI-2 serial interface, with D-PHY
  * @V4L2_MBUS_CSI2_CPHY: MIPI CSI-2 serial interface, with C-PHY
+ * @V4L2_MBUS_INVALID: invalid bus type (keep as last)
  */
 enum v4l2_mbus_type {
        V4L2_MBUS_UNKNOWN,
@@ -112,6 +113,7 @@ enum v4l2_mbus_type {
        V4L2_MBUS_CCP2,
        V4L2_MBUS_CSI2_DPHY,
        V4L2_MBUS_CSI2_CPHY,
+       V4L2_MBUS_INVALID,
 };
 
 /**
-- 
2.27.0