2020-08-04 21:08:28

by Rustam Kovhaev

Subject: [PATCH] cfg80211: switch from WARN() to pr_warn() in is_user_regdom_saved()

this warning can be triggered by userspace, so it should not cause a
panic if panic_on_warn is set

Reported-and-tested-by: [email protected]
Link: https://syzkaller.appspot.com/bug?extid=d451401ffd00a60677ee
Signed-off-by: Rustam Kovhaev <[email protected]>
---
net/wireless/reg.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 0d74a31ef0ab..86355938ae8f 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -415,10 +415,10 @@ static bool is_user_regdom_saved(void)
return false;

/* This would indicate a mistake on the design */
- if (WARN(!is_world_regdom(user_alpha2) && !is_an_alpha2(user_alpha2),
- "Unexpected user alpha2: %c%c\n",
- user_alpha2[0], user_alpha2[1]))
+ if (!is_world_regdom(user_alpha2) && !is_an_alpha2(user_alpha2)) {
+ pr_warn("Unexpected user_alpha2: %c%c\n", user_alpha2[0], user_alpha2[1]);
return false;
+ }

return true;
}
--
2.27.0

2020-08-19 15:23:46

by Rustam Kovhaev

Subject: Re: [PATCH] cfg80211: switch from WARN() to pr_warn() in is_user_regdom_saved()

On Wed, Aug 19, 2020 at 10:46:34AM +0200, Johannes Berg wrote:
> On Tue, 2020-08-04 at 14:05 -0700, Rustam Kovhaev wrote:
> > this warning can be triggered by userspace, so it should not cause a
> > panic if panic_on_warn is set
>
> This is incorrect, it just addresses a particular symptom. I'll make a
> proper fix.
tyvm!