On Fri, Dec 01, 2023 at 02:30:02PM +0100, Olivier Matz wrote:
> The backport of commit 21032425c36f ("net: vlan: fix a UAF in
> vlan_dev_real_dev()") in v5.15.3 introduced a netdevice refcount leak
> that was fixed upstream.
>
> The first commit is trivial and helps to limit conflicts when applying
> the second commit, which fixes the issue.
>
> The last conflict is solved by using dev_put() instead of
> dev_put_track(), as the latter was introduced in 5.17 and does not
> exist in 5.15.x.
>
> Xin Long (2):
> vlan: introduce vlan_dev_free_egress_priority
> vlan: move dev_put into vlan_dev_uninit
>
> net/8021q/vlan.h | 2 +-
> net/8021q/vlan_dev.c | 15 +++++++++++----
> net/8021q/vlan_netlink.c | 7 ++++---
> 3 files changed, 16 insertions(+), 8 deletions(-)
>
> --
> 2.30.2
>
>
Both now queued up, thanks.
greg k-h
