[PATCH v1] net: rfkill: Correct value returned for invalid parameter
From: Zijun Hu <hidden>
Date: 2024-06-13 14:04:54
Also in:
linux-wireless
Subsystem:
rfkill, the rest · Maintainers:
Johannes Berg, Linus Torvalds
Kernel API rfkill_set_hw_state_reason() does not return current combined block state when its parameter @reason is invalid, that is wrong according to its comments, fixed by correcting value returned. Signed-off-by: Zijun Hu <redacted> --- previous discussion link: https://lore.kernel.org/all/1717771212-30723-2-git-send-email-quic_zijuhu@quicinc.com/ (local) net/rfkill/core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index c3feb4f49d09..1f3082526658 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c@@ -543,13 +543,14 @@ bool rfkill_set_hw_state_reason(struct rfkill *rfkill, { unsigned long flags; bool ret, prev; + const unsigned long reason_mask = RFKILL_HARD_BLOCK_SIGNAL | + RFKILL_HARD_BLOCK_NOT_OWNER; BUG_ON(!rfkill); - if (WARN(reason & - ~(RFKILL_HARD_BLOCK_SIGNAL | RFKILL_HARD_BLOCK_NOT_OWNER), - "hw_state reason not supported: 0x%lx", reason)) - return blocked; + if (WARN(reason & ~reason_mask, + "hw_state reason not supported: 0x%lx", reason)) + return rfkill_blocked(rfkill); spin_lock_irqsave(&rfkill->lock, flags); prev = !!(rfkill->hard_block_reasons & reason);
--
2.7.4