From: Pascal Ernster <pascal.ernster+wireguard@rub.de>
To: wireguard@lists.zx2c4.com
Subject: Ubuntu kernel >= 5.3.0-52.46 breaks DKMS build for wireguard-linux-compat >= 1.0.20200429, patch included
Date: Sun, 3 May 2020 22:33:43 +0200 [thread overview]
Message-ID: <6565463c-0a99-9137-5cc2-714e2fbd6dfc@rub.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 792 bytes --]
Hi,
Ubuntu kernel 5.3.0-52.46 breaks the DKMS build for
wireguard-linux-compat 1.0.20200429. Function skb_reset_redirect() got
added to the kernel's include/linux/skbuff.h, but collides with the
function defintion from wireguard-linux-compat's compat/compat.h:
https://kernel.ubuntu.com/git/ubuntu/ubuntu-eoan.git/commit/include/linux/skbuff.h?h=Ubuntu-5.3.0-52.46&id=b8845f9376917c49f5e219288613c6cbe172f884
Kernel 5.3.0-52.46 is not only used for Ubuntu 19.10, but serves also as
HWE kernel in Ubuntu 18.04.
I've got the DKMS module to compile again on Ubuntu 18.04 using the
attached patch, but I'm not sure it that's the correct solution to the
problem since the colliding function definitions differ and I'm not
really familiar with the kernel's network internals.
Regards
Pascal
[-- Attachment #2: fix-for-ubuntu-kernel-5.3.0-52.46.patch --]
[-- Type: text/x-patch, Size: 860 bytes --]
--- /var/lib/dkms/wireguard/1.0.20200429/source/compat/compat.h 2020-04-30 23:03:40.000000000 +0000
+++ /var/lib/dkms/wireguard/1.0.20200429/source/compat/compat.h 2020-04-30 23:03:40.000000000 +0000
@@ -1021,12 +1021,14 @@ out:
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29) || (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14))
#include <linux/skbuff.h>
#include <net/sch_generic.h>
+#if !(defined(UTS_UBUNTU_RELEASE_ABI) && (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) && (UTS_UBUNTU_RELEASE_ABI >= 52)) // Ubuntu 18.04-HWE and 19.10 >= 5.3.0-52.46
static inline void skb_reset_redirect(struct sk_buff *skb)
{
#ifdef CONFIG_NET_SCHED
skb_reset_tc(skb);
#endif
}
+#endif
#endif
#if defined(ISUBUNTU1604) || defined(ISRHEL7)
next reply other threads:[~2020-05-04 11:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-03 20:33 Pascal Ernster [this message]
2020-05-05 1:37 ` Jason A. Donenfeld
2020-05-05 3:52 ` Pascal Ernster
2020-05-05 4:03 ` Jason A. Donenfeld
2020-05-05 4:27 ` Pascal Ernster
2020-05-06 16:22 ` Simon Deziel
2020-05-07 0:29 ` Jason A. Donenfeld
2020-05-20 15:04 ` Vasili Pupkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6565463c-0a99-9137-5cc2-714e2fbd6dfc@rub.de \
--to=pascal.ernster+wireguard@rub.de \
--cc=wireguard@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).