The ki_ioprio field of struct kiocb is 16-bits (u16) but often handled as an int in the block layer. E.g. ioprio_check_cap() takes an int as argument. With such implicit int casting function calls, the upper 16-bits of the int argument may be left uninitialized by the compiler, resulting in invalid values for the IOPRIO_PRIO_CLASS() macro (garbage upper bits) and in an error return for functions such as ioprio_check_cap(). Fix this by masking the result of the shift by IOPRIO_CLASS_SHIFT bits in the IOPRIO_PRIO_CLASS() macro. The new macro IOPRIO_CLASS_MASK defines the 3-bits mask for the priority class. Similarly, apply the IOPRIO_PRIO_MASK mask to the data argument of the IOPRIO_PRIO_VALUE() macro to ignore the upper bits of the data value. The IOPRIO_CLASS_MASK mask is also applied to the class argument of this macro before shifting the result by IOPRIO_CLASS_SHIFT bits. While at it, also change the argument name of the IOPRIO_PRIO_CLASS() and IOPRIO_PRIO_DATA() macros from "mask" to "ioprio" to reflect the fact that a priority value should be passed rather than a mask.
Showing the changes to include/uapi (1 of 1 file). Show all
Unified · Split
| @@ -5,12 +5,16 @@ · 4 unmodified lines | |||
| 5 | /* | 5 | /* |
| 6 | * Gives us 8 prio classes with 13-bits of data for each class | 6 | * Gives us 8 prio classes with 13-bits of data for each class |
| 7 | */ | 7 | */ |
| 8 | #define IOPRIO_CLASS_SHIFT (13) | 8 | #define IOPRIO_CLASS_SHIFT 13 |
| 9 | #define IOPRIO_CLASS_MASK 0x07 | ||
| 9 | #define IOPRIO_PRIO_MASK ((1UL << IOPRIO_CLASS_SHIFT) - 1) | 10 | #define IOPRIO_PRIO_MASK ((1UL << IOPRIO_CLASS_SHIFT) - 1) |
| 10 | 11 | ||
| 11 | #define IOPRIO_PRIO_CLASS(mask) ((mask) >> IOPRIO_CLASS_SHIFT) | 12 | #define IOPRIO_PRIO_CLASS(ioprio) \ |
| 12 | #define IOPRIO_PRIO_DATA(mask) ((mask) & IOPRIO_PRIO_MASK) | 13 | (((ioprio) >> IOPRIO_CLASS_SHIFT) & IOPRIO_CLASS_MASK) |
| 13 | #define IOPRIO_PRIO_VALUE(class, data) (((class) << IOPRIO_CLASS_SHIFT) | data) | 14 | #define IOPRIO_PRIO_DATA(ioprio) ((ioprio) & IOPRIO_PRIO_MASK) |
| 15 | #define IOPRIO_PRIO_VALUE(class, data) \ | ||
| 16 | ((((class) & IOPRIO_CLASS_MASK) << IOPRIO_CLASS_SHIFT) | \ | ||
| 17 | ((data) & IOPRIO_PRIO_MASK)) | ||
| 14 | 18 | ||
| 15 | /* | 19 | /* |
| 16 | * These are the io priority groups as implemented by the BFQ and mq-deadline | 20 | * These are the io priority groups as implemented by the BFQ and mq-deadline |