ACK: [SRU X][PATCH 0/6] netfilter: nf_conncount: fix for LP#1811094

[Stefan Bader]

On 10.01.19 14:12, Mauricio Faria de Oliveira wrote:
> Hi Stefan,
> 
> Thanks for reviewing.
> 
> On Thu, Jan 10, 2019 at 8:25 AM Stefan Bader <stefan.bader at canonical.com> wrote:
>>
>> On 10.01.19 04:31, Mauricio Faria de Oliveira wrote:
>>> BugLink: https://bugs.launchpad.net/bugs/1811094
> [snip]
>>> Mauricio Faria de Oliveira (1):
>>>   UBUNTU: SAUCE: netfilter: xt_connlimit: remove the 'addr' parameter in
>>>     add_hlist()
>>
>> Just double checking since I do not see this set on 4.4.y right now: you are
>> positive that this does affect 4.4 the same? [snip]
> 
> Yes, it does affect 4.4 the same. It's actually been originally
> reported against a
> Xenial 4.4-based kernel, and the reported had an interest in 4.14.y, that's why.
> (I realize that sending it to 4.4.y would land it in Xenial 4.4
> eventually, but for
> timing reasons, I done the SRU first.  I can send it to 4.4.y as well,
> if required.)
> 
>> [snip] If yes, think we could just take
>> the patches from 4.14.y and try to get those into our Xenial tree. Just in case,
>> this is an acceptable approach and has been done before (I mean instead of
>> working with the upstream changes, take those which were applied to a closer
>> upstream stable).
> 
> I didn't know it, thanks for mentioning!
> 
>> [snip] I did a quick test with "netfilter: xt_connlimit: don't store
>> address in the conn nodes" and it looks like that could just become a
>>
>> (cherry-picked from commit 5e614e212a6359af78b6034ceb12c56f71d5b423 linux-4.14.y)
> 
> The reason I didn't do it (i.e., squash this SAUCE in the commit as in
> 4.14.y) is to have a
> more equivalent backport between Xenial and Cosmic, because that patch
> is already applied

Ah ok. Though actually something that I would really not expect to happen. More
likely to have Xenial and Bionic similar because they are closer in versions
than Xenial and Cosmic. :)

> in Cosmic -- so I wanted to avoid the difference of 1) a backport with
> this SAUCE squashed
> for Xenial, and 2) SAUCE commit only for Bionic -- so I did the same
> SAUCE patch for both
> (on top of the cherry-pick in Xenial, and the applied commit in Bionic).

Since there is a backport in some upstream maintained tree (which got the
maintainers blessing) I probably would have rather gone with pulling that back
into Xenial. But since you already prepared differently and it looks like #5
again needs work between 4.14 and 4.4, lets just go with this.

Acked-by: Stefan Bader <stefan.bader at canonical.com>
> 
> Hope this helps.
> Thanks!
> 
> 
> 
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20190110/3cf820ed/attachment.sig>