mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 09:31:50 +00:00
HID: picoLCD: bounds check in dump_buff_as_hex()
Make sure we keep enough space for terminating NUL character after last newline. If we have too much data, replace last byte with '.'s to make overflow visible. Using hex_dump_to_buffer() is not interesting as it adds more overhead and does not append the trailing linefeed. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
206e3f1cda
commit
5ed84c341c
@ -381,16 +381,16 @@ static void dump_buff_as_hex(char *dst, size_t dst_sz, const u8 *data,
|
||||
const size_t data_len)
|
||||
{
|
||||
int i, j;
|
||||
for (i = j = 0; i < data_len && j + 3 < dst_sz; i++) {
|
||||
for (i = j = 0; i < data_len && j + 4 < dst_sz; i++) {
|
||||
dst[j++] = hex_asc[(data[i] >> 4) & 0x0f];
|
||||
dst[j++] = hex_asc[data[i] & 0x0f];
|
||||
dst[j++] = ' ';
|
||||
}
|
||||
if (j < dst_sz) {
|
||||
dst[j--] = '\0';
|
||||
dst[j] = '\n';
|
||||
} else
|
||||
dst[j] = '\0';
|
||||
dst[j] = '\0';
|
||||
if (j > 0)
|
||||
dst[j-1] = '\n';
|
||||
if (i < data_len && j > 2)
|
||||
dst[j-2] = dst[j-3] = '.';
|
||||
}
|
||||
|
||||
void picolcd_debug_out_report(struct picolcd_data *data,
|
||||
|
Loading…
Reference in New Issue
Block a user