diff options
| author | David S. Miller <davem@davemloft.net> | 2022-11-18 12:09:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-11-18 12:09:20 +0000 |
| commit | 8cf4f8c7d99addb6c2c2273fac7c20ca7c50db45 (patch) | |
| tree | 99dbd72ee730c75e9ebfba6ae5b61aaf8f233b63 /net/rxrpc/local_object.c | |
| parent | fd896e38e5df2c5b68c78eee2fc425c4dcd3b4dd (diff) | |
| parent | 66f6fd278c6780ea8c8bb7dac839132d8e76dd53 (diff) | |
Merge tag 'rxrpc-next-20221116' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
David Howells says:
====================
rxrpc: Fix oops and missing config conditionals
The patches that were pulled into net-next previously[1] had some issues
that this patchset fixes:
(1) Fix missing IPV6 config conditionals.
(2) Fix an oops caused by calling udpv6_sendmsg() directly on an AF_INET
socket.
(3) Fix the validation of network addresses on entry to socket functions
so that we don't allow an AF_INET6 address if we've selected an
AF_INET transport socket.
Link: https://lore.kernel.org/r/166794587113.2389296.16484814996876530222.stgit@warthog.procyon.org.uk/ [1]
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/local_object.c')
| -rw-r--r-- | net/rxrpc/local_object.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c index a178f71e5082..a943fdf91e24 100644 --- a/net/rxrpc/local_object.c +++ b/net/rxrpc/local_object.c @@ -33,7 +33,8 @@ static void rxrpc_encap_err_rcv(struct sock *sk, struct sk_buff *skb, int err, { if (ip_hdr(skb)->version == IPVERSION) return ip_icmp_error(sk, skb, err, port, info, payload); - return ipv6_icmp_error(sk, skb, err, port, info, payload); + if (IS_ENABLED(CONFIG_AF_RXRPC_IPV6)) + return ipv6_icmp_error(sk, skb, err, port, info, payload); } /* |