diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-12-12 14:49:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-12-12 14:49:35 +0100 |
| commit | 7b26bc6582b13a52a42a4a9765e8f30d58a81198 (patch) | |
| tree | 80737d9bb4abf42b8e2061a5edacdfbe5ac9b7d6 /net/ipv4/tcp_bpf.c | |
| parent | b2e538a9827dd04ab5273bf4be8eb2edb84357b0 (diff) | |
| parent | 255cc582e6e16191a20d54bcdbca6c91d3e90c5e (diff) | |
| download | linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.tar.gz linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.tar.bz2 linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.zip | |
Merge tag 'asoc-fix-v6.12-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.13
A small pile of driver specific fixes, all quite small and not
particularly major.
Diffstat (limited to 'net/ipv4/tcp_bpf.c')
| -rw-r--r-- | net/ipv4/tcp_bpf.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index 370993c03d31..99cef92e6290 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -441,7 +441,6 @@ more_data: cork = true; psock->cork = NULL; } - sk_msg_return(sk, msg, tosend); release_sock(sk); origsize = msg->sg.size; @@ -453,8 +452,9 @@ more_data: sock_put(sk_redir); lock_sock(sk); + sk_mem_uncharge(sk, sent); if (unlikely(ret < 0)) { - int free = sk_msg_free_nocharge(sk, msg); + int free = sk_msg_free(sk, msg); if (!cork) *copied -= free; @@ -468,7 +468,7 @@ more_data: break; case __SK_DROP: default: - sk_msg_free_partial(sk, msg, tosend); + sk_msg_free(sk, msg); sk_msg_apply_bytes(psock, tosend); *copied -= (tosend + delta); return -EACCES; @@ -484,11 +484,8 @@ more_data: } if (msg && msg->sg.data[msg->sg.start].page_link && - msg->sg.data[msg->sg.start].length) { - if (eval == __SK_REDIRECT) - sk_mem_charge(sk, tosend - sent); + msg->sg.data[msg->sg.start].length) goto more_data; - } } return ret; } |