From: Olaf Kirch <okir@suse.de>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@oss.sgi.com
Subject: [PATCH] Problem with recent CMSG_COMPAT_OK fix
Date: Tue, 4 Jan 2005 17:59:34 +0100 [thread overview]
Message-ID: <20050104165934.GJ7761@suse.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 1010 bytes --]
Hi,
The recent fixes for cmsg_len handling seem to break 32bit compatibility
at least on x86_64. The new CMSG_COMPAT_OK macro requires that cmsg_len
is greater or equal the size of struct cmsghdr, which is the 64bit
version of the struct. The code should really check against the size
of struct compat_cmsghdr.
Signed-off-by: Olaf Kirch <okir@suse.de>
--- linux-2.6.10/net/compat.c.orig 2005-01-04 13:51:49.000000000 +0100
+++ linux-2.6.10/net/compat.c 2005-01-04 16:53:38.000000000 +0100
@@ -125,7 +125,7 @@
(struct compat_cmsghdr __user *)NULL)
#define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
- ((ucmlen) >= sizeof(struct cmsghdr) && \
+ ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
(ucmlen) <= (unsigned long) \
((mhdr)->msg_controllen - \
((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
--
Olaf Kirch | Things that make Monday morning interesting, #2:
okir@suse.de | "We have 8,000 NFS mount points, why do we keep
---------------+ running out of privileged ports?"
[-- Attachment #2: cmsg-compat-signedness-fix-fix --]
[-- Type: text/plain, Size: 921 bytes --]
From: Olaf Kirch <okir@suse.de>
Subject: Fix cmsg_len checks in 32bit compat mode
References: 49517 - LTC13227
The recent fixes for cmsg_len handling seem to break 32bit compatibility
at least on x86_64. The new CMSG_COMPAT_OK macro requires that cmsg_len
is greater or equal the size of struct cmsghdr, which is the 64bit
version of the struct. The code should really check against the size
of struct compat_cmsghdr.
Signed-off-by: Olaf Kirch <okir@suse.de>
--- linux-2.6.10/net/compat.c.orig 2005-01-04 13:51:49.000000000 +0100
+++ linux-2.6.10/net/compat.c 2005-01-04 16:53:38.000000000 +0100
@@ -125,7 +125,7 @@
(struct compat_cmsghdr __user *)NULL)
#define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
- ((ucmlen) >= sizeof(struct cmsghdr) && \
+ ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
(ucmlen) <= (unsigned long) \
((mhdr)->msg_controllen - \
((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
next reply other threads:[~2005-01-04 16:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-04 16:59 Olaf Kirch [this message]
2005-01-10 20:52 ` [PATCH] Problem with recent CMSG_COMPAT_OK fix David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050104165934.GJ7761@suse.de \
--to=okir@suse.de \
--cc=davem@davemloft.net \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).