Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8450fca authored by Stephen Warren's avatar Stephen Warren Committed by Greg Kroah-Hartman
Browse files

printk: correctly align __log_buf 



__log_buf must be aligned, because a 64-bit value is written directly
to it as part of struct log. Alignment of the log entries is typically
handled by log_store(), but this only triggers for subsequent entries,
not the very first (or wrapped) entries.

Cc: Kay Sievers <kay@vrfy.org>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af468109

kernel/printk.c

+6 −7
Original line number Diff line number Diff line
@@ -227,8 +227,13 @@ static u32 clear_idx; 
#define LOG_LINE_MAX 1024



/* record buffer */

#if !defined(CONFIG_64BIT) || defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)

#define LOG_ALIGN 4

#else

#define LOG_ALIGN 8

#endif

#define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT)

static char __log_buf[__LOG_BUF_LEN];

static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN);

static char *log_buf = __log_buf;

static u32 log_buf_len = __LOG_BUF_LEN;
@@ -279,12 +284,6 @@ static u32 log_next(u32 idx) 
	return idx + msg->len;

}



#if !defined(CONFIG_64BIT) || defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)

#define LOG_ALIGN 4

#else

#define LOG_ALIGN 8

#endif



/* insert record into the buffer, discard old ones, update heads */

static void log_store(int facility, int level,

		      const char *dict, u16 dict_len,