diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-11-08 12:22:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-11-08 12:22:02 -0800 |
| commit | f49b2d89fb10ef5fa5fa1993f648ec5daa884bef (patch) | |
| tree | 3cb42608fcaee9dedee227ac6c1d45894ea321db /include | |
| parent | fs/userfaultfd: Fix maple tree iterator in userfaultfd_unregister() (diff) | |
| parent | capabilities: fix undefined behavior in bit shift for CAP_TO_MASK (diff) | |
| download | linux-dev-f49b2d89fb10ef5fa5fa1993f648ec5daa884bef.tar.xz linux-dev-f49b2d89fb10ef5fa5fa1993f648ec5daa884bef.zip | |
Merge tag 'lsm-pr-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
Pull lsm fix from Paul Moore:
"A small capability patch to fix an instance of undefined behavior in a
shift operator caused when shifting a signed value too far.
While the fix is trivial and I can't imagine it causing a problem in a
backport, I'm not explicitly marking it for stable on the off chance
that there is some system out there which is relying on some wonky
unexpected behavior which this patch could break; *if* it does break,
IMO it's better that to happen in a minor or -rcX release and not in a
stable backport"
* tag 'lsm-pr-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
capabilities: fix undefined behavior in bit shift for CAP_TO_MASK
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/capability.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h index 463d1ba2232a..3d61a0ae055d 100644 --- a/include/uapi/linux/capability.h +++ b/include/uapi/linux/capability.h @@ -426,7 +426,7 @@ struct vfs_ns_cap_data { */ #define CAP_TO_INDEX(x) ((x) >> 5) /* 1 << 5 == bits in __u32 */ -#define CAP_TO_MASK(x) (1 << ((x) & 31)) /* mask for indexed __u32 */ +#define CAP_TO_MASK(x) (1U << ((x) & 31)) /* mask for indexed __u32 */ #endif /* _UAPI_LINUX_CAPABILITY_H */ |