| Message ID | 20240917-fix-log-buffer-overflow-v3-1-26fd441bb7df@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [bluez,v3] monitor: fix buffer overflow when terminal width > 255 | expand |
Hello: This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Tue, 17 Sep 2024 14:30:46 +0800 you wrote: > In current code, we create line buffer with size 256, which can contains > 255 ASCII characters. But in modern system, terminal can have larger > width. It may cause buffer overflow in snprintf() text. > > limits.h provides constant LINE_MAX. > > {LINE_MAX} > Unless otherwise noted, the maximum length, in bytes, of a > utility's input line (either standard input or another > file), when the utility is described as processing text > files. The length includes room for the trailing <newline>. > Minimum Acceptable Value: {_POSIX2_LINE_MAX} > > [...] Here is the summary with links: - [bluez,v3] monitor: fix buffer overflow when terminal width > 255 https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=2908491c7efe You are awesome, thank you!
diff --git a/monitor/packet.c b/monitor/packet.c index c2599fe6864ab44d657c121fcc3ceecc1ebc52a6..32a440bbea6888ab6321e973dbb23d9728864557 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -26,6 +26,7 @@ #include <time.h> #include <sys/time.h> #include <sys/socket.h> +#include <limits.h> #include "lib/bluetooth.h" #include "lib/uuid.h" @@ -376,7 +377,7 @@ static void print_packet(struct timeval *tv, struct ucred *cred, char ident, const char *text, const char *extra) { int col = num_columns(); - char line[256], ts_str[96], pid_str[140]; + char line[LINE_MAX], ts_str[96], pid_str[140]; int n, ts_len = 0, ts_pos = 0, len = 0, pos = 0; static size_t last_frame;
In current code, we create line buffer with size 256, which can contains 255 ASCII characters. But in modern system, terminal can have larger width. It may cause buffer overflow in snprintf() text. limits.h provides constant LINE_MAX. {LINE_MAX} Unless otherwise noted, the maximum length, in bytes, of a utility's input line (either standard input or another file), when the utility is described as processing text files. The length includes room for the trailing <newline>. Minimum Acceptable Value: {_POSIX2_LINE_MAX} Signed-off-by: Celeste Liu <CoelacanthusHex@gmail.com> --- Changes in v3: - Use constant LINE_MAX in limits.h instead dynamic heap allocation. - Link to v2: https://lore.kernel.org/r/20240915-fix-log-buffer-overflow-v2-1-fb6b52a7d4b2@gmail.com Changes in v2: - Add free() forgot in v1. - Link to v1: https://patch.msgid.link/20240914-fix-log-buffer-overflow-v1-1-733cb4fff673@gmail.com --- monitor/packet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- base-commit: 41f943630d9a03c40e95057b2ac3d96470b9c71e change-id: 20240914-fix-log-buffer-overflow-9aa5e61ee5b8 Best regards,