Skip to content

Commit 1fa2c0a

Browse files
committed
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
2 parents f6235eb + 16b89f6 commit 1fa2c0a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/compat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm)
294294
(struct compat_cmsghdr __user *)msg->msg_control;
295295
unsigned int o_flags = (msg->msg_flags & MSG_CMSG_CLOEXEC) ? O_CLOEXEC : 0;
296296
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);
298298
int err = 0, i;
299299

300300
for (i = 0; i < fdmax; i++) {

0 commit comments

Comments
 (0)