]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
openvswitch: switch from WARN to pr_warn
authorAaron Conole <aconole@redhat.com>
Tue, 25 Oct 2022 10:50:17 +0000 (06:50 -0400)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 28 Nov 2022 14:18:18 +0000 (15:18 +0100)
BugLink: https://bugs.launchpad.net/bugs/1997981
[ Upstream commit fd954cc1919e35cb92f78671cab6e42d661945a3 ]

As noted by Paolo Abeni, pr_warn doesn't generate any splat and can still
preserve the warning to the user that feature downgrade occurred.  We
likely cannot introduce other kinds of checks / enforcement here because
syzbot can generate different genl versions to the datapath.

Reported-by: syzbot+31cde0bef4bbf8ba2d86@syzkaller.appspotmail.com
Fixes: 44da5ae5fbea ("openvswitch: Drop user features if old user space attempted to create datapath")
Cc: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Aaron Conole <aconole@redhat.com>
Acked-by: Ilya Maximets <i.maximets@ovn.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
net/openvswitch/datapath.c

index 46ef1525b2e5e036d55a9700d723d25d75c6016f..94c48122fdc3a3ec9c3e0a7b96ada97dd4991461 100644 (file)
@@ -1605,7 +1605,8 @@ static void ovs_dp_reset_user_features(struct sk_buff *skb,
        if (IS_ERR(dp))
                return;
 
-       WARN(dp->user_features, "Dropping previously announced user features\n");
+       pr_warn("%s: Dropping previously announced user features\n",
+               ovs_dp_name(dp));
        dp->user_features = 0;
 }