[pkg-netfilter-team] Bug#975376: Bug#975376: Fails to build with Linux 5.9.9 because of change in ip_route_me_harder()

[Jeremy Sowden]

On 2020-11-21, at 11:23:36 +0100, Sven Hartge wrote:
> Package: xtables-addons-dkms
> Version: 3.11-1
> Severity: grave
>
> Hi!
>
> Kernel 5.9.9 changes ip_route_me_harder() with commit
> 46d6c5ae953cc0be38efd0e469284df7c4328cf8 causing a build failure for
> xtables-addons-dkms:
>
> ,----
> | In file included from /usr/src/linux-headers-5.9.0-3-common/include/linux/netfilter/x_tables.h:245,
> |                  from /var/lib/dkms/xtables-addons/3.11/build/extensions/xt_DELUDE.c:20:
> | /usr/src/linux-headers-5.9.0-3-common/include/linux/netfilter_ipv4.h:19:74: note: expected ‘struct sk_buff *’ but argument is of type ‘unsigned int’
> |    19 | int ip_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb, unsigned addr_type);
> |       |                                                          ~~~~~~~~~~~~~~~~^~~
> | /var/lib/dkms/xtables-addons/3.11/build/extensions/xt_DELUDE.c:125:6: error: too few arguments to function ‘ip_route_me_harder’
> |   125 |  if (ip_route_me_harder(net, nskb, addr_type))
> |       |      ^~~~~~~~~~~~~~~~~~
> | In file included from /usr/src/linux-headers-5.9.0-3-common/include/linux/netfilter/x_tables.h:245,
> |                  from /var/lib/dkms/xtables-addons/3.11/build/extensions/xt_DELUDE.c:20:
> | /usr/src/linux-headers-5.9.0-3-common/include/linux/netfilter_ipv4.h:19:5: note: declared here
> |    19 | int ip_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb, unsigned addr_type);
> |       |     ^~~~~~~~~~~~~~~~~~
> | /var/lib/dkms/xtables-addons/3.11/build/extensions/xt_ECHO.c: In function ‘echo_tg4’:
> | /var/lib/dkms/xtables-addons/3.11/build/extensions/xt_ECHO.c:195:39: error: passing argument 2 of ‘ip_route_me_harder’ from incompatible pointer type [-Werror=incompatible-pointer-types]
> |   195 |  if (ip_route_me_harder(par_net(par), newskb, RTN_UNSPEC) != 0)
> |       |                                       ^~~~~~
> |       |                                       |
> |       |                                       struct sk_buff *
> | In file included from /usr/src/linux-headers-5.9.0-3-common/include/linux/netfilter/x_tables.h:245,
> |                  from /var/lib/dkms/xtables-addons/3.11/build/extensions/xt_ECHO.c:16:
> | /usr/src/linux-headers-5.9.0-3-common/include/linux/netfilter_ipv4.h:19:54: note: expected ‘struct sock *’ but argument is of type ‘struct sk_buff *’
> |    19 | int ip_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb, unsigned addr_type);
> |       |                                         ~~~~~~~~~~~~~^~
> | /var/lib/dkms/xtables-addons/3.11/build/extensions/xt_ECHO.c:195:6: error: too few arguments to function ‘ip_route_me_harder’
> |   195 |  if (ip_route_me_harder(par_net(par), newskb, RTN_UNSPEC) != 0)
> |       |      ^~~~~~~~~~~~~~~~~~
> | In file included from /usr/src/linux-headers-5.9.0-3-common/include/linux/netfilter/x_tables.h:245,
> |                  from /var/lib/dkms/xtables-addons/3.11/build/extensions/xt_ECHO.c:16:
> | /usr/src/linux-headers-5.9.0-3-common/include/linux/netfilter_ipv4.h:19:5: note: declared here
> |    19 | int ip_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb, unsigned addr_type);
> |       |     ^~~~~~~~~~~~~~~~~~
> `----
>
> This has been fixed upstream with 3.12 and 3.13 respectively.

Yes, I just noticed the new releases.  I'm in the process of packaging
3.13 now.

J.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-netfilter-team/attachments/20201121/9a212686/attachment.sig>