diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-05-02 21:05:13 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-02 21:06:25 +0200 |
| commit | e958da0ddbe831197a0023251880a4a09d5ba268 (patch) | |
| tree | eacded26f9563064a44fd1afe730493898adadb9 /net/rxrpc/insecure.c | |
| parent | Merge branch 'bnxt_en-updates-for-net-next' (diff) | |
| parent | Merge tag 'net-6.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-e958da0ddbe831197a0023251880a4a09d5ba268.tar.xz linux-e958da0ddbe831197a0023251880a4a09d5ba268.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
include/linux/filter.h
kernel/bpf/core.c
66e13b615a0c ("bpf: verifier: prevent userspace memory access")
d503a04f8bc0 ("bpf: Add support for certain atomics in bpf_arena to x86 JIT")
https://lore.kernel.org/all/20240429114939.210328b0@canb.auug.org.au/
No adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/rxrpc/insecure.c')
| -rw-r--r-- | net/rxrpc/insecure.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/insecure.c b/net/rxrpc/insecure.c index f2701068ed9e..6716c021a532 100644 --- a/net/rxrpc/insecure.c +++ b/net/rxrpc/insecure.c @@ -19,7 +19,7 @@ static int none_init_connection_security(struct rxrpc_connection *conn, */ static struct rxrpc_txbuf *none_alloc_txbuf(struct rxrpc_call *call, size_t remain, gfp_t gfp) { - return rxrpc_alloc_data_txbuf(call, min_t(size_t, remain, RXRPC_JUMBO_DATALEN), 0, gfp); + return rxrpc_alloc_data_txbuf(call, min_t(size_t, remain, RXRPC_JUMBO_DATALEN), 1, gfp); } static int none_secure_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb) |