diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2023-01-29 21:23:08 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-10 11:33:35 +0300 |
| commit | 351c8d8650d1ccc006255fa01f98b6c6496a02e5 (patch) | |
| tree | 05da7c742834c4a044a42b665d73db63baa1153a /drivers/usb/early/xhci-dbc.c | |
| parent | c169890b5f7b2e47a472d30ba7004168c187bb71 (diff) | |
| download | linux-351c8d8650d1ccc006255fa01f98b6c6496a02e5.tar.xz | |
usb: early: xhci-dbc: Fix a potential out-of-bound memory access
[ Upstream commit a4a97ab3db5c081eb6e7dba91306adefb461e0bd ]
If xdbc_bulk_write() fails, the values in 'buf' can be anything. So the
string is not guaranteed to be NULL terminated when xdbc_trace() is called.
Reserve an extra byte, which will be zeroed automatically because 'buf' is
a static variable, in order to avoid troubles, should it happen.
Fixes: aeb9dd1de98c ("usb/early: Add driver for xhci debug capability")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/d6a7562c5e839a195cee85db6dc81817f9372cb1.1675016180.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/usb/early/xhci-dbc.c')
| -rw-r--r-- | drivers/usb/early/xhci-dbc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c index bfb7e2b85299..7ef0a4b39762 100644 --- a/drivers/usb/early/xhci-dbc.c +++ b/drivers/usb/early/xhci-dbc.c @@ -874,7 +874,8 @@ retry: static void early_xdbc_write(struct console *con, const char *str, u32 n) { - static char buf[XDBC_MAX_PACKET]; + /* static variables are zeroed, so buf is always NULL terminated */ + static char buf[XDBC_MAX_PACKET + 1]; int chunk, ret; int use_cr = 0; |