From: Daniel Borkmann <dborkman@redhat.com>
To: davej@redhat.com
Cc: trinity@vger.kernel.org
Subject: [PATCH] setsockopt: sanitize PF_PACKET SOL_PACKET options for zero-copy rings
Date: Wed, 1 May 2013 17:10:15 +0200 [thread overview]
Message-ID: <3f833e7246a223dc545e3f9d06b75ebeca723e6f.1367420720.git.dborkman@redhat.com> (raw)
In-Reply-To: <cover.1367420720.git.dborkman@redhat.com>
In SOL_PACKET, we can sanitize the setsockopt() syscall a bit in the
following ways:
i) PACKET_VERSION is always checked in the kernel and it is quite
likely to return -EINVAL here, very unlikely to crash this option.
However, if we pass the correct values to it (TPACKET_V1, TPACKET_V2,
TPACKET_V3), we can jump into this version specific code on other
syscalls on that socket.
ii) PACKET_{R,T}X_RING never gets a structure of size int, so it might
always return -EINVAL here. Depending on the TPACKET version, it
can either be tpacket_req or tpacket_req3. Make it more likely to
have size tpacket_req though.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
syscalls/setsockopt.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/syscalls/setsockopt.c b/syscalls/setsockopt.c
index ce610af..2932bfb 100644
--- a/syscalls/setsockopt.c
+++ b/syscalls/setsockopt.c
@@ -185,6 +185,22 @@ void sanitise_setsockopt(int childno)
case SOL_PACKET:
val = rand() % NR_SOL_PACKET_OPTS;
shm->a3[childno] = packet_opts[val];
+
+ /* Adjust length according to operation set. */
+ switch (shm->a3[childno]) {
+ case PACKET_VERSION:
+ page_rand[0] = rand() % 3; /* tpacket versions 1/2/3 */
+ break;
+ case PACKET_TX_RING:
+ case PACKET_RX_RING:
+ if (rand() % 3 == 0)
+ shm->a5[childno] = sizeof(struct tpacket_req3);
+ else
+ shm->a5[childno] = sizeof(struct tpacket_req);
+ break;
+ default:
+ break;
+ }
break;
case SOL_ATM:
--
1.7.11.7
next parent reply other threads:[~2013-05-01 15:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1367420720.git.dborkman@redhat.com>
2013-05-01 15:10 ` Daniel Borkmann [this message]
2013-05-02 13:54 ` [PATCH] setsockopt: sanitize PF_PACKET SOL_PACKET options for zero-copy rings Dave Jones
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=3f833e7246a223dc545e3f9d06b75ebeca723e6f.1367420720.git.dborkman@redhat.com \
--to=dborkman@redhat.com \
--cc=davej@redhat.com \
--cc=trinity@vger.kernel.org \
/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).