summaryrefslogtreecommitdiff
path: root/net/compat.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2020-06-09 16:11:29 -0700
committerKees Cook <keescook@chromium.org>2020-07-13 11:03:30 -0700
commitd9539752d23283db4692384a634034f451261e29 (patch)
treed08d186a133cd962d3f7afeb318622c7a21e84e5 /net/compat.c
parent11eb004ef7ead0c43586adea0340b51da095bdee (diff)
downloadlinux-d9539752d23283db4692384a634034f451261e29.tar.gz
net/compat: Add missing sock updates for SCM_RIGHTS
Add missed sock updates to compat path via a new helper, which will be used more in coming patches. (The net/core/scm.c code is left as-is here to assist with -stable backports for the compat path.) Cc: Christoph Hellwig <hch@lst.de> Cc: Sargun Dhillon <sargun@sargun.me> Cc: Jakub Kicinski <kuba@kernel.org> Cc: stable@vger.kernel.org Fixes: 48a87cc26c13 ("net: netprio: fd passed in SCM_RIGHTS datagram not set correctly") Fixes: d84295067fc7 ("net: net_cls: fd passed in SCM_RIGHTS datagram not set correctly") Acked-by: Christian Brauner <christian.brauner@ubuntu.com> Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'net/compat.c')
-rw-r--r--net/compat.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/compat.c b/net/compat.c
index 5e3041a2c37d..2937b816107d 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -309,6 +309,7 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
break;
}
/* Bump the usage count and install the file. */
+ __receive_sock(fp[i]);
fd_install(new_fd, get_file(fp[i]));
}