From: Janne Grunau Date: Wed, 26 Feb 2025 19:00:06 +0000 (+0000) Subject: soc: apple: rtkit: Cut syslog messages after the first '\0' X-Git-Tag: v6.15-rc1~158^2~17^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e210227f0259d2666cc41b28ed1b7b0b0a99ed4d;p=thirdparty%2Fkernel%2Flinux.git soc: apple: rtkit: Cut syslog messages after the first '\0' Certain messages from DCP contain NUL bytes in the random data after the NUL terminated syslog message. Since the syslog message ends with '\n' this results in a dev_info() message terminated with two newlines and an empty printed line in the kernel log. Signed-off-by: Janne Grunau Reviewed-by: Alyssa Rosenzweig Link: https://lore.kernel.org/r/20250226-apple-soc-misc-v2-4-c3ec37f9021b@svenpeter.dev Signed-off-by: Sven Peter --- diff --git a/drivers/soc/apple/rtkit.c b/drivers/soc/apple/rtkit.c index 4b78463dd5a10..5fffd0f003dc2 100644 --- a/drivers/soc/apple/rtkit.c +++ b/drivers/soc/apple/rtkit.c @@ -477,7 +477,7 @@ static void apple_rtkit_syslog_rx_log(struct apple_rtkit *rtk, u64 msg) log_context[sizeof(log_context) - 1] = 0; - msglen = rtk->syslog_msg_size - 1; + msglen = strnlen(rtk->syslog_msg_buffer, rtk->syslog_msg_size - 1); while (msglen > 0 && should_crop_syslog_char(rtk->syslog_msg_buffer[msglen - 1])) msglen--;