a9a4c080de
The size of the buffer than can be written to is currently incorrect, it is
always the size of the entire buffer even though the snprintf is writing
as position pos into the buffer. Fix this by setting the buffer size to be
the number of bytes left in the buffer, namely sizeof(buf) - pos.
Addresses-Coverity: ("Out-of-bounds access")
Fixes: 7b0e2c4f6b ("wlcore: fix overlapping snprintf arguments in debugfs")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210419141405.180582-1-colin.king@canonical.com
104 lines
3.0 KiB
C
104 lines
3.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* This file is part of wl1271
|
|
*
|
|
* Copyright (C) 2009 Nokia Corporation
|
|
*
|
|
* Contact: Luciano Coelho <luciano.coelho@nokia.com>
|
|
*/
|
|
|
|
#ifndef __DEBUGFS_H__
|
|
#define __DEBUGFS_H__
|
|
|
|
#include "wlcore.h"
|
|
|
|
__printf(4, 5) int wl1271_format_buffer(char __user *userbuf, size_t count,
|
|
loff_t *ppos, char *fmt, ...);
|
|
|
|
int wl1271_debugfs_init(struct wl1271 *wl);
|
|
void wl1271_debugfs_exit(struct wl1271 *wl);
|
|
void wl1271_debugfs_reset(struct wl1271 *wl);
|
|
void wl1271_debugfs_update_stats(struct wl1271 *wl);
|
|
|
|
#define DEBUGFS_FORMAT_BUFFER_SIZE 256
|
|
|
|
#define DEBUGFS_READONLY_FILE(name, fmt, value...) \
|
|
static ssize_t name## _read(struct file *file, char __user *userbuf, \
|
|
size_t count, loff_t *ppos) \
|
|
{ \
|
|
struct wl1271 *wl = file->private_data; \
|
|
return wl1271_format_buffer(userbuf, count, ppos, \
|
|
fmt "\n", ##value); \
|
|
} \
|
|
\
|
|
static const struct file_operations name## _ops = { \
|
|
.read = name## _read, \
|
|
.open = simple_open, \
|
|
.llseek = generic_file_llseek, \
|
|
};
|
|
|
|
#define DEBUGFS_ADD(name, parent) \
|
|
do { \
|
|
debugfs_create_file(#name, 0400, parent, \
|
|
wl, &name## _ops); \
|
|
} while (0)
|
|
|
|
|
|
#define DEBUGFS_ADD_PREFIX(prefix, name, parent) \
|
|
do { \
|
|
debugfs_create_file(#name, 0400, parent, \
|
|
wl, &prefix## _## name## _ops); \
|
|
} while (0)
|
|
|
|
#define DEBUGFS_FWSTATS_FILE(sub, name, fmt, struct_type) \
|
|
static ssize_t sub## _ ##name## _read(struct file *file, \
|
|
char __user *userbuf, \
|
|
size_t count, loff_t *ppos) \
|
|
{ \
|
|
struct wl1271 *wl = file->private_data; \
|
|
struct struct_type *stats = wl->stats.fw_stats; \
|
|
\
|
|
wl1271_debugfs_update_stats(wl); \
|
|
\
|
|
return wl1271_format_buffer(userbuf, count, ppos, fmt "\n", \
|
|
stats->sub.name); \
|
|
} \
|
|
\
|
|
static const struct file_operations sub## _ ##name## _ops = { \
|
|
.read = sub## _ ##name## _read, \
|
|
.open = simple_open, \
|
|
.llseek = generic_file_llseek, \
|
|
};
|
|
|
|
#define DEBUGFS_FWSTATS_FILE_ARRAY(sub, name, len, struct_type) \
|
|
static ssize_t sub## _ ##name## _read(struct file *file, \
|
|
char __user *userbuf, \
|
|
size_t count, loff_t *ppos) \
|
|
{ \
|
|
struct wl1271 *wl = file->private_data; \
|
|
struct struct_type *stats = wl->stats.fw_stats; \
|
|
char buf[DEBUGFS_FORMAT_BUFFER_SIZE] = ""; \
|
|
int pos = 0; \
|
|
int i; \
|
|
\
|
|
wl1271_debugfs_update_stats(wl); \
|
|
\
|
|
for (i = 0; i < len && pos < sizeof(buf); i++) \
|
|
pos += snprintf(buf + pos, sizeof(buf) - pos, \
|
|
"[%d] = %d\n", i, stats->sub.name[i]); \
|
|
\
|
|
return wl1271_format_buffer(userbuf, count, ppos, "%s", buf); \
|
|
} \
|
|
\
|
|
static const struct file_operations sub## _ ##name## _ops = { \
|
|
.read = sub## _ ##name## _read, \
|
|
.open = simple_open, \
|
|
.llseek = generic_file_llseek, \
|
|
};
|
|
|
|
#define DEBUGFS_FWSTATS_ADD(sub, name) \
|
|
DEBUGFS_ADD(sub## _ ##name, stats)
|
|
|
|
|
|
#endif /* WL1271_DEBUGFS_H */
|