Skip to content

Commit bdfe6de

Browse files
povikmarcan
authored andcommitted
soc: apple: rtkit: Crop syslog messages
Crop trailing whitespace, null, and newline characters in syslog messages received from coprocessors. Notably DCP sends its messages including a trailing newline, so prior to this change we would end up cluttering the kernel log by repeated newlines at the end of messages. Signed-off-by: Martin Povišer <povik+lin@cutebit.org> Reviewed-by: Hector Martin <marcan@marcan.st> Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent 2234448 commit bdfe6de

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

drivers/soc/apple/rtkit.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,11 +409,17 @@ static void apple_rtkit_syslog_rx_init(struct apple_rtkit *rtk, u64 msg)
409409
rtk->syslog_n_entries, rtk->syslog_msg_size);
410410
}
411411

412+
static bool should_crop_syslog_char(char c)
413+
{
414+
return c == '\n' || c == '\r' || c == ' ' || c == '\0';
415+
}
416+
412417
static void apple_rtkit_syslog_rx_log(struct apple_rtkit *rtk, u64 msg)
413418
{
414419
u8 idx = msg & 0xff;
415420
char log_context[24];
416421
size_t entry_size = 0x20 + rtk->syslog_msg_size;
422+
int msglen;
417423

418424
if (!rtk->syslog_msg_buffer) {
419425
dev_warn(
@@ -446,7 +452,13 @@ static void apple_rtkit_syslog_rx_log(struct apple_rtkit *rtk, u64 msg)
446452
rtk->syslog_msg_size);
447453

448454
log_context[sizeof(log_context) - 1] = 0;
449-
rtk->syslog_msg_buffer[rtk->syslog_msg_size - 1] = 0;
455+
456+
msglen = rtk->syslog_msg_size - 1;
457+
while (msglen > 0 &&
458+
should_crop_syslog_char(rtk->syslog_msg_buffer[msglen - 1]))
459+
msglen--;
460+
461+
rtk->syslog_msg_buffer[msglen] = 0;
450462
dev_info(rtk->dev, "RTKit: syslog message: %s: %s\n", log_context,
451463
rtk->syslog_msg_buffer);
452464

0 commit comments

Comments
 (0)