[NET]: Fix CMSG32_OK macros.
Linux Kernel Mailing List <[email protected]>
| Newsgroups | gmane.linux.kernel.commits.2-4 |
|---|---|
| Message-ID | <[email protected]> |
ChangeSet 1.1560, 2005/01/14 13:36:10-08:00, [email protected] [NET]: Fix CMSG32_OK macros. Needs to check cmsghdr32 not cmsghdr. Signed-off-by: David S. Miller <[email protected]> arch/ia64/ia32/sys_ia32.c | 2 +- arch/mips64/kernel/linux32.c | 2 +- arch/parisc/kernel/sys_parisc32.c | 2 +- arch/ppc64/kernel/sys_ppc32.c | 2 +- arch/s390x/kernel/linux32.c | 2 +- arch/sparc64/kernel/sys_sparc32.c | 2 +- include/asm-x86_64/socket32.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff -Nru a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c --- a/arch/ia64/ia32/sys_ia32.c 2005-01-15 07:06:36 -08:00 +++ b/arch/ia64/ia32/sys_ia32.c 2005-01-15 07:06:36 -08:00 @@ -1370,7 +1370,7 @@ ((len) >= sizeof(struct cmsghdr32) ? (struct cmsghdr32 *)(ctl) : (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) #define CMSG32_OK(ucmlen, ucmsg, mhdr) \ - ((ucmlen) >= sizeof(struct cmsghdr) && \ + ((ucmlen) >= sizeof(struct cmsghdr32) && \ (ucmlen) <= (unsigned long) \ ((mhdr)->msg_controllen - \ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) diff -Nru a/arch/mips64/kernel/linux32.c b/arch/mips64/kernel/linux32.c --- a/arch/mips64/kernel/linux32.c 2005-01-15 07:06:36 -08:00 +++ b/arch/mips64/kernel/linux32.c 2005-01-15 07:06:36 -08:00 @@ -2484,7 +2484,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) #define CMSG32_OK(ucmlen, ucmsg, mhdr) \ - ((ucmlen) >= sizeof(struct cmsghdr) && \ + ((ucmlen) >= sizeof(struct cmsghdr32) && \ (ucmlen) <= (unsigned long) \ ((mhdr)->msg_controllen - \ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) diff -Nru a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c --- a/arch/parisc/kernel/sys_parisc32.c 2005-01-15 07:06:36 -08:00 +++ b/arch/parisc/kernel/sys_parisc32.c 2005-01-15 07:06:36 -08:00 @@ -1815,7 +1815,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) #define CMSG32_OK(ucmlen, ucmsg, mhdr) \ - ((ucmlen) >= sizeof(struct cmsghdr) && \ + ((ucmlen) >= sizeof(struct cmsghdr32) && \ (ucmlen) <= (unsigned long) \ ((mhdr)->msg_controllen - \ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) diff -Nru a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c --- a/arch/ppc64/kernel/sys_ppc32.c 2005-01-15 07:06:36 -08:00 +++ b/arch/ppc64/kernel/sys_ppc32.c 2005-01-15 07:06:36 -08:00 @@ -3274,7 +3274,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) #define CMSG32_OK(ucmlen, ucmsg, mhdr) \ - ((ucmlen) >= sizeof(struct cmsghdr) && \ + ((ucmlen) >= sizeof(struct cmsghdr32) && \ (ucmlen) <= (unsigned long) \ ((mhdr)->msg_controllen - \ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) diff -Nru a/arch/s390x/kernel/linux32.c b/arch/s390x/kernel/linux32.c --- a/arch/s390x/kernel/linux32.c 2005-01-15 07:06:36 -08:00 +++ b/arch/s390x/kernel/linux32.c 2005-01-15 07:06:36 -08:00 @@ -2307,7 +2307,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) #define CMSG32_OK(ucmlen, ucmsg, mhdr) \ - ((ucmlen) >= sizeof(struct cmsghdr) && \ + ((ucmlen) >= sizeof(struct cmsghdr32) && \ (ucmlen) <= (unsigned long) \ ((mhdr)->msg_controllen - \ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) diff -Nru a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c --- a/arch/sparc64/kernel/sys_sparc32.c 2005-01-15 07:06:36 -08:00 +++ b/arch/sparc64/kernel/sys_sparc32.c 2005-01-15 07:06:36 -08:00 @@ -2355,7 +2355,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) #define CMSG32_OK(ucmlen, ucmsg, mhdr) \ - ((ucmlen) >= sizeof(struct cmsghdr) && \ + ((ucmlen) >= sizeof(struct cmsghdr32) && \ (ucmlen) <= (unsigned long) \ ((mhdr)->msg_controllen - \ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) diff -Nru a/include/asm-x86_64/socket32.h b/include/asm-x86_64/socket32.h --- a/include/asm-x86_64/socket32.h 2005-01-15 07:06:36 -08:00 +++ b/include/asm-x86_64/socket32.h 2005-01-15 07:06:36 -08:00 @@ -46,7 +46,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) #define CMSG32_OK(ucmlen, ucmsg, mhdr) \ - ((ucmlen) >= sizeof(struct cmsghdr) && \ + ((ucmlen) >= sizeof(struct cmsghdr32) && \ (ucmlen) <= (unsigned long) \ ((mhdr)->msg_controllen - \ ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))