summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-11-17 10:38:36 +0100
committerDavid S. Miller <davem@davemloft.net>2015-11-17 15:25:44 -0500
commit4194b4914a824c21bcad9305d6180825f4dc1f5e (patch)
tree9f8f042d945098206934bedc9326decbf92490b9
parent321beec5047af83db90c88114b7e664b156f49fe (diff)
downloadop-kernel-dev-4194b4914a824c21bcad9305d6180825f4dc1f5e.zip
op-kernel-dev-4194b4914a824c21bcad9305d6180825f4dc1f5e.tar.gz
packet: Don't check frames_per_block against negative values
rb->frames_per_block is an unsigned int, thus can never be negative. Also fix spacing in the calculation of frames_per_block. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/packet/af_packet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 242bce1..533981d 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -4121,8 +4121,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
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 <= 0))
+ rb->frames_per_block = req->tp_block_size / req->tp_frame_size;
+ if (unlikely(rb->frames_per_block == 0))
goto out;
if (unlikely((rb->frames_per_block * req->tp_block_nr) !=
req->tp_frame_nr))
OpenPOWER on IntegriCloud