Merge additional July 2017 security update.
Merge 'android-msm-marlin-3.18-nyc-mr2-security-next'
to pick up missed patches.
July 2017.1
Bug: 38136799
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 8af38c4..3faaf31 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3313,6 +3313,8 @@
return -EBUSY;
if (copy_from_user(&val, optval, sizeof(val)))
return -EFAULT;
+ if (val > INT_MAX)
+ return -EINVAL;
po->tp_reserve = val;
return 0;
}
@@ -3818,6 +3820,8 @@
rb->frames_per_block = req->tp_block_size/req->tp_frame_size;
if (unlikely(rb->frames_per_block <= 0))
goto out;
+ if (unlikely(req->tp_block_size > UINT_MAX / req->tp_block_nr))
+ goto out;
if (unlikely((rb->frames_per_block * req->tp_block_nr) !=
req->tp_frame_nr))
goto out;
