netdev - [PATCH 5/5] net/packet: reorder checks for ring buffer parameters

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <c2f4929f3fcdc610c49dbf3d86f7312e84be8579.1490709552.git.andreyknvl@google.com>
Date:   Tue, 28 Mar 2017 16:00:50 +0200
From:   Andrey Konovalov <andreyknvl@...gle.com>
To:     "David S . Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Willem de Bruijn <willemb@...gle.com>,
        Craig Gallek <cgallek@...gle.com>
Cc:     netdev@...r.kernel.org, Dmitry Vyukov <dvyukov@...gle.com>,
        Kostya Serebryany <kcc@...gle.com>,
        Andrey Konovalov <andreyknvl@...gle.com>
Subject: [PATCH 5/5] net/packet: reorder checks for ring buffer parameters

No semantic changes.

Improves readability.

Signed-off-by: Andrey Konovalov <andreyknvl@...gle.com>
---
 net/packet/af_packet.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 28b49749d1af..de25736a7988 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -4191,6 +4191,11 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
 
 		err = -EINVAL;
 
+		if (unlikely(!PAGE_ALIGNED(req->tp_block_size)))
+			goto out;
+		if (unlikely(req->tp_frame_size & (TPACKET_ALIGNMENT - 1)))
+			goto out;
+
 		if (unlikely(req->tp_block_size > INT_MAX))
 			goto out;
 		if (unlikely(req->tp_block_size == 0))
@@ -4205,19 +4210,15 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
 		if (unlikely(po->tp_reserve >= req->tp_frame_size))
 			goto out;
 
-		if (unlikely(!PAGE_ALIGNED(req->tp_block_size)))
+		rb->frames_per_block = req->tp_block_size / req->tp_frame_size;
+		if (unlikely((rb->frames_per_block * req->tp_block_nr) !=
+					req->tp_frame_nr))
 			goto out;
+
 		if (po->tp_version >= TPACKET_V3 &&
 		    req->tp_block_size <=
 			  BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv))
 			goto out;
-		if (unlikely(req->tp_frame_size & (TPACKET_ALIGNMENT - 1)))
-			goto out;
-
-		rb->frames_per_block = req->tp_block_size / req->tp_frame_size;
-		if (unlikely((rb->frames_per_block * req->tp_block_nr) !=
-					req->tp_frame_nr))
-			goto out;
 
 		err = -ENOMEM;
 		order = get_order(req->tp_block_size);
-- 
2.12.2.564.g063fe858b8-goog