[OpenWrt-Devel] [PATCH 2/2] [RFC] kernel: bump 4.14 to 4.14.54 for 18.06

[Koen Vandeputte]

On 2018-07-10 22:08, Stijn Segers wrote:
> Refreshed patches. The bump from .53 to .54 introduced a minor change in net/netfilter/nf_tables_api.c [1] but I am unable to
> judge if this is a fluke or not, so I'd like a second pair of eyes on that. It's a single 'table[0]' being replaced by 'table':
>
> - if (filter && filter->table[0] &&
> + if (filter && filter->table &&
>
> I have updated the 335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch accordingly.
>
> Compile-tested on: ramips/mt7621, x86/64
> Run-tested on: ramips/mt7621, x86/64
>
> [1]	https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/diff/net/netfilter/nf_tables_api.c?id=v4.14.54&id2=v4.14.53

Hi Stijn,

I ran into the same yesterday when creating the bump to 4.14.54 for master.

The upstream patch in 4.14 is altering this check in 1 location only:  
nf_tables_dump_obj()  [1]
Within OpenWrt, this functionality was backported from 4.16 and 4.18

Within the "335-.." patch, there is another function doing the exact 
same check on the exact same data: nf_tables_dump_flowtable() [2]
Your kernel bump patch should also fix it over there. (line 1084)


[1] 
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=v4.14.54&id=b8d8cde449fd51db0bb407dece03d36ced1acb83
[2] 
https://git.openwrt.org/?p=openwrt/staging/xback.git;a=blob;f=target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch;h=787f62ef8f0b2a0d9ca8e1fb360a6c06115b40fc;hb=b84a07b3803bd39d0a1eb1b040718a023b8f7971#l1048


Koen

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel