net/scm: Fix typo in SCM_RIGHTS compat refactoring
PATCH 1/1 net/scm: Fix typo in SCM_RIGHTS compat refactoring
When refactoring the SCM_RIGHTS code, I accidentally mis-merged my native/compat diffs, which entirely broke using SCM_RIGHTS in compat mode. Use the correct helper.
--- net/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/compat.c +1 -1
@@ -294,7 +294,7 @@ void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm) (struct compat_cmsghdr __user *)msg->msg_control;unsigned int o_flags = (msg->msg_flags &MSG_CMSG_CLOEXEC ) ?O_CLOEXEC :0 ;int fdmax =min_t (int,scm_max_fds_compat (msg), scm->fp->count); -int __user *cmsg_data =CMSG_USER_DATA (cm); +int __user *cmsg_data =CMSG_COMPAT_DATA (cm);int err =0 , i;for (i =0 ; i < fdmax; i++) {
Signature · 5 lines
2.25.1 -- Kees Cook
Quoted 11 lines · Kees Cook
When refactoring the
SCM_RIGHTScode, I accidentally mis-merged my native/compat diffs, which entirely broke usingSCM_RIGHTSin compat mode. Use the correct helper.Reported-by Christian Zigotzky <[email protected]>Reported-by "Alex Xu (Hello71)" <[email protected]>Suggested-by Thadeu Lima de Souza Cascardo <[email protected]>Fixes c0029de50982 ("net/scm: Regularize compat handling of scm_detach_fds()")Signed-off-by Kees Cook <[email protected]>
Hi, Kees.
You might want to add the Teste-by line that Alex Xu sent. And if my ack adds any value on top of Suggested-by, here it goes:
Thanks.
Cascardo.
Quoted 23 lines
--- net/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/compat.c +1
-1@@ -294,7 +294,7 @@ void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm) (struct compat_cmsghdr __user *)msg->msg_control;unsigned int o_flags = (msg->msg_flags &MSG_CMSG_CLOEXEC ) ?O_CLOEXEC :0 ;int fdmax =min_t (int,scm_max_fds_compat (msg), scm->fp->count); -int __user *cmsg_data =CMSG_USER_DATA (cm); +int __user *cmsg_data =CMSG_COMPAT_DATA (cm);int err =0 , i;for (i =0 ; i < fdmax; i++) {Signature · 5 lines
2.25.1 -- Kees Cook
Quoted 4 lines · Kees Cook
When refactoring the
SCM_RIGHTScode, I accidentally mis-merged my native/compat diffs, which entirely broke usingSCM_RIGHTSin compat mode. Use the correct helper.
Quoted 8 lines
Reported-by Christian Zigotzky <[email protected]>Reported-by "Alex Xu (Hello71)" <[email protected]>Suggested-by Thadeu Lima de Souza Cascardo <[email protected]>Fixes c0029de50982 ("net/scm: Regularize compat handling of scm_detach_fds()")Signed-off-by Kees Cook <[email protected]>---
Oh fun,
Thanks for fixing this quickly, Kees! I already built stuff on top of the notifier fd injection work we did this cycle so it's great that we don't have to revert this!
Quoted 22 lines
net/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/compat.c +1
-1@@ -294,7 +294,7 @@ void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm) (struct compat_cmsghdr __user *)msg->msg_control;unsigned int o_flags = (msg->msg_flags &MSG_CMSG_CLOEXEC ) ?O_CLOEXEC :0 ;int fdmax =min_t (int,scm_max_fds_compat (msg), scm->fp->count); -int __user *cmsg_data =CMSG_USER_DATA (cm); +int __user *cmsg_data =CMSG_COMPAT_DATA (cm);int err =0 , i;for (i =0 ; i < fdmax; i++) {Signature · 5 lines
2.25.1 -- Kees Cook