diff options
author | Will Deacon <will.deacon@arm.com> | 2017-12-01 10:29:39 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-12-04 14:51:12 -0500 |
commit | 4ce413d1840b25b101be3c0559161db8891f3360 (patch) | |
tree | 969656d510deb1d314d44055b2daf840ba0cf9f7 | |
parent | bb5c43428252f27b875c764451321a83a531d6e5 (diff) |
irqdesc: Use bool return type instead of int
The irq_balancing_disabled and irq_is_percpu{,_devid} functions are
clearly intended to return bool like the functions in
kernel/irq/settings.h, but actually return an int containing a masked
value of desc->status_use_accessors. This can lead to subtle breakage
if, for example, the return value is subsequently truncated when
assigned to a narrower type.
As Linus points out:
| In particular, what can (and _has_ happened) is that people end up
| using these functions that return true or false, and they assign the
| result to something like a bitfield (or a char) or whatever.
|
| And the code looks *obviously* correct, when you have things like
|
| dev->percpu = irq_is_percpu_devid(dev->irq);
|
| and that "percpu" thing is just one status bit among many. It may even
| *work*, because maybe that "percpu" flag ends up not being all that
| important, or it just happens to never be set on the particular
| hardware that people end up testing.
|
| But while it looks obviously correct, and might even work, it's really
| fundamentally broken. Because that "true or false" function didn't
| actually return 0/1, it returned 0 or 0x20000.
|
| And 0x20000 may not fit in a bitmask or a "char" or whatever.
Fix the problem by consistently using bool as the return type for these
functions.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: marc.zyngier@arm.com
Link: https://lkml.kernel.org/r/1512142179-24616-1-git-send-email-will.deacon@arm.com
-rw-r--r-- | include/linux/irqdesc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index dd418955962b..39fb3700f7a9 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h | |||
@@ -230,7 +230,7 @@ irq_set_chip_handler_name_locked(struct irq_data *data, struct irq_chip *chip, | |||
230 | data->chip = chip; | 230 | data->chip = chip; |
231 | } | 231 | } |
232 | 232 | ||
233 | static inline int irq_balancing_disabled(unsigned int irq) | 233 | static inline bool irq_balancing_disabled(unsigned int irq) |
234 | { | 234 | { |
235 | struct irq_desc *desc; | 235 | struct irq_desc *desc; |
236 | 236 | ||
@@ -238,7 +238,7 @@ static inline int irq_balancing_disabled(unsigned int irq) | |||
238 | return desc->status_use_accessors & IRQ_NO_BALANCING_MASK; | 238 | return desc->status_use_accessors & IRQ_NO_BALANCING_MASK; |
239 | } | 239 | } |
240 | 240 | ||
241 | static inline int irq_is_percpu(unsigned int irq) | 241 | static inline bool irq_is_percpu(unsigned int irq) |
242 | { | 242 | { |
243 | struct irq_desc *desc; | 243 | struct irq_desc *desc; |
244 | 244 | ||
@@ -246,7 +246,7 @@ static inline int irq_is_percpu(unsigned int irq) | |||
246 | return desc->status_use_accessors & IRQ_PER_CPU; | 246 | return desc->status_use_accessors & IRQ_PER_CPU; |
247 | } | 247 | } |
248 | 248 | ||
249 | static inline int irq_is_percpu_devid(unsigned int irq) | 249 | static inline bool irq_is_percpu_devid(unsigned int irq) |
250 | { | 250 | { |
251 | struct irq_desc *desc; | 251 | struct irq_desc *desc; |
252 | 252 | ||