Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / core / scm.c

diff --git a/net/core/scm.c b/net/core/scm.c
index d8820438ba374be7e723512635b40695853e4807..b1ff8a4417489f7c211b4bddd2d07de1caf19cfd 100644 (file)
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -14,6 +14,7 @@
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/sched/user.h>
 #include <linux/mm.h>
 #include <linux/kernel.h>
 #include <linux/stat.h>
@@ -71,7 +72,7 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp)
        struct file **fpp;
        int i, num;
 
-       num = (cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr)))/sizeof(int);
+       num = (cmsg->cmsg_len - sizeof(struct cmsghdr))/sizeof(int);
 
        if (num <= 0)
                return 0;