Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'seccomp-v5.9-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull seccomp fix from Kees Cook:
"This fixes my typo in the SCM_RIGHTS refactoring that broke compat
handling.

Thanks to Thadeu Lima de Souza Cascardo for tracking it down, and to
Christian Zigotzky and Alex Xu for their reports"

* tag 'seccomp-v5.9-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
net/scm: Fix typo in SCM_RIGHTS compat refactoring

+1 -1
+1 -1
net/compat.c
··· 294 294 (struct compat_cmsghdr __user *)msg->msg_control; 295 295 unsigned int o_flags = (msg->msg_flags & MSG_CMSG_CLOEXEC) ? O_CLOEXEC : 0; 296 296 int fdmax = min_t(int, scm_max_fds_compat(msg), scm->fp->count); 297 - int __user *cmsg_data = CMSG_USER_DATA(cm); 297 + int __user *cmsg_data = CMSG_COMPAT_DATA(cm); 298 298 int err = 0, i; 299 299 300 300 for (i = 0; i < fdmax; i++) {