diff options
| author | Andrew Chant <achant@google.com> | 2017-05-19 15:22:13 -0700 |
|---|---|---|
| committer | Andrew Chant <achant@google.com> | 2017-05-19 15:22:13 -0700 |
| commit | 5547b00553ad5f7c25006368244d524fb6e2f913 (patch) | |
| tree | 817b1a806d6bb3b4e8c67510f0d2c5d33febc0b7 | |
| parent | bd52f078197d1e2485c514f22b9150790779348e (diff) | |
| parent | c0afb15f903dac3d281322875f5026b2ca9ac637 (diff) | |
Merge additional July 2017 security update.android-7.1.2_r0.24
Merge 'android-msm-angler-3.10-nyc-mr2-security-next'
to pick up missed patches.
July 2017.1
Bug: 38138153
| -rw-r--r-- | net/packet/af_packet.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 2e87251cacd2..45b64637aa9b 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3178,6 +3178,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv return -EBUSY; if (copy_from_user(&val, optval, sizeof(val))) return -EFAULT; + if (val > INT_MAX) + return -EINVAL; po->tp_reserve = val; return 0; } @@ -3675,6 +3677,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, 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; |