iptables-netflow-dkms: linux 5.8 changes broke 5.4 kernel

[Andrea Righi]

[Impact]

After applying the compatibility changes to support kernel 5.8 we broke kernel 5.4 in the process. The change that causes the breakage is the redefinition of `struct timeval`, that is not needed in 5.4, because it's already defined.

[Test case]

$ sudo apt install iptables-netflow-dkms

Build error(s) is(are) reported in make.log.

[Fix]

Make sure `struct timeval` is defined in iptables-netflow-dkms only with kernels >= 5.8.

[Regression potential]

Change verified both with 5.4 and 5.8 kernel. The only thing that could break is using this module with some kernels >= 5.8 that (somehow) have `struct timeval` already defined in their headers. For now, with the kernels that we support, this case is unlikely to happen.

[Andrea Righi (arighi)]

Attached debdiff tested both with kernel 5.4 and 5.8.

[Brian Murray (brian-murray)]

Hello Andrea, or anyone else affected,

Accepted iptables-netflow into focal-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/iptables-netflow/2.4-2ubuntu0.2 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, what testing has been performed on the package and change the tag from verification-needed-focal to verification-done-focal. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed-focal. In either case, without details of your testing we will not be able to proceed.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance for helping!

N.B. The updated package will be released to -updates after the bug(s) fixed by this package have been verified and the package has been in -proposed for a minimum of 7 days.

[Kleber Sacilotto de Souza (kleber-souza)]

I can confirm that iptables-netflow 2.4-2ubuntu0.2 dkms modules can be built and loaded successfully with both linux 5.4 and linux-hwe 5.8 in Focal.

$ dkms status
ipt-netflow, 2.4, 5.4.0-55-generic, x86_64: installed
ipt-netflow, 2.4, 5.8.0-30-generic, x86_64: installed

ADT tests were also successfully in all arches with both kernels:

* linux 5.4
- amd64: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/amd64/i/iptables-netflow/20201124_203826_a2929@/log.gz
- arm64: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/arm64/i/iptables-netflow/20201124_205546_a2929@/log.gz
- armhf: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/armhf/i/iptables-netflow/20201124_204454_a2929@/log.gz
- ppc64el: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/ppc64el/i/iptables-netflow/20201124_204122_a2929@/log.gz
- s390x: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/s390x/i/iptables-netflow/20201124_215345_ffcdd@/log.gz

* linux-hwe-5.8
- amd64: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/amd64/i/iptables-netflow/20201126_133218_498eb@/log.gz
- arm64: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/arm64/i/iptables-netflow/20201126_133830_5ee7a@/log.gz
- armhf: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/armhf/i/iptables-netflow/20201126_133723_22955@/log.gz
- ppc64el: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/ppc64el/i/iptables-netflow/20201126_133304_22955@/log.gz
- s390x: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/s390x/i/iptables-netflow/20201126_133117_498eb@/log.gz

Thanks!

[Łukasz Zemczak (sil2100)]

The verification of the Stable Release Update for iptables-netflow has completed successfully and the package is now being released to -updates. Subsequently, the Ubuntu Stable Release Updates Team is being unsubscribed and will not receive messages about this bug report. In the event that you encounter a regression using the package from -updates please report a new bug using ubuntu-bug and tag the bug report regression-update so we can easily find any regressions.

[Launchpad Janitor (janitor)]

This bug was fixed in the package iptables-netflow - 2.4-2ubuntu0.2

---------------
iptables-netflow (2.4-2ubuntu0.2) focal; urgency=medium

  * Fix redefinition of struct timeval with kernel 5.4 (LP: #1904753)

iptables-netflow (2.4-2ubuntu0.1) focal; urgency=medium

  * Linux 5.8 compatibility (LP: #1899739):
    - debian/patches/0001-Compatibility-with-kernel-5.7.patch
    - debian/patches/0002-Compatibility-with-kernel-5.8.patch

 -- Andrea Righi <email address hidden> Wed, 18 Nov 2020 14:56:37 +0000