ANDROID: ABI fixup for abi break in struct dst_ops
In commit 92f1655a ("net: fix __dst_negative_advice() race") the struct dst_ops callback negative_advice is callback changes function parameters. But as this pointer is part of a structure that is tracked in the ABI checker, the tool triggers when this is changed. However, the callback pointer is internal to the networking stack, so changing the function type is safe, so needing to preserve this is not required. To do so, switch the function pointer type back to the old one so that the checking tools pass, AND then do a hard cast of the function pointer to the new type when assigning and calling the function. Bug: 343727534 Bug: 344562971 Fixes: 92f1655a ("net: fix __dst_negative_advice() race") Change-Id: I48d4ab4bbd29f8edc8fbd7923828b7f78a23e12e Signed-off-by:Greg Kroah-Hartman <gregkh@google.com> Signed-off-by:
Robin Peng <robinpeng@google.com>
Showing
- include/net/dst_ops.h 11 additions, 1 deletioninclude/net/dst_ops.h
- include/net/sock.h 10 additions, 2 deletionsinclude/net/sock.h
- net/ipv4/route.c 1 addition, 1 deletionnet/ipv4/route.c
- net/ipv6/route.c 1 addition, 1 deletionnet/ipv6/route.c
- net/xfrm/xfrm_policy.c 1 addition, 1 deletionnet/xfrm/xfrm_policy.c
Loading