1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 7b270a2e6ed5..14d162952c3b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2010,6 +2010,8 @@ create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen)
                 return 0;
 
         pos += snprintf(hdr + pos, hdrlen - pos, "SUBSYSTEM=%s", subsys);
+        if (pos >= hdrlen)
+                goto overflow;
 
         /*
          * Add device identifier DEVICE=:
@@ -2041,7 +2043,14 @@ create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen)
                                 "DEVICE=+%s:%s", subsys, dev_name(dev));
         }
 
+        if (pos >= hdrlen)
+                goto overflow;
+
         return pos;
+
+overflow:
+        dev_WARN(dev, "device/subsystem name too long");
+        return 0;
 }
 
 int dev_vprintk_emit(int level, const struct device *dev,