No semantic changes.
Improves readability.
Signed-off-by: Andrey Konovalov <andreyk...@google.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
