Commit f49b2d89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 59f2f4b8 46653972

include/uapi/linux/capability.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */