| From 75ce93fd373c1f6c1d01863fdb903216543f052d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 25 Oct 2022 06:50:17 -0400 |
| Subject: openvswitch: switch from WARN to pr_warn |
| |
| From: Aaron Conole <aconole@redhat.com> |
| |
| [ 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> |
| --- |
| net/openvswitch/datapath.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c |
| index 10423757e781..56999d8528a4 100644 |
| --- a/net/openvswitch/datapath.c |
| +++ b/net/openvswitch/datapath.c |
| @@ -1556,7 +1556,8 @@ static void ovs_dp_reset_user_features(struct sk_buff *skb, struct genl_info *in |
| 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; |
| } |
| |
| -- |
| 2.35.1 |
| |
