diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-08-20 04:09:18 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-08-20 04:09:18 +0300 |
| commit | f444fea7896dbc267249d27f604082a51b8efca2 (patch) | |
| tree | d72e809d28ff7a1cb02f648c858d106de1be859d /drivers/net/hamradio | |
| parent | 9e5f10fe577be7974c721c0c2050fa6c967d4565 (diff) | |
| parent | f87d64319e6f980c82acfc9b95ed523d053fb7ac (diff) | |
| download | linux-f444fea7896dbc267249d27f604082a51b8efca2.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/ptp/Kconfig:
55c8fca1dae1 ("ptp_pch: Restore dependency on PCI")
e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/6pack.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index fcf3af76b6d7..8fe8887d506a 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -827,6 +827,12 @@ static void decode_data(struct sixpack *sp, unsigned char inbyte) return; } + if (sp->rx_count_cooked + 2 >= sizeof(sp->cooked_buf)) { + pr_err("6pack: cooked buffer overrun, data loss\n"); + sp->rx_count = 0; + return; + } + buf = sp->raw_buf; sp->cooked_buf[sp->rx_count_cooked++] = buf[0] | ((buf[1] << 2) & 0xc0); |