summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-20 14:04:34 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-20 14:04:33 -0800
commitf91543d4e810d0fe851c7d3606b77d39499e97d4 (patch)
tree4cbf91f3c44611ee44e9e61313c58b3b0e1d9db6
parent08f2969dd312a94dacd2c1e866aa82caf9f8bccb (diff)
parentb9e5da8b6f55ada020c74ff64c9c6e1f539aaac0 (diff)
Merge "net: ping: Fix stack buffer overflow in ping_common_sendmsg()"
-rw-r--r--net/ipv4/ping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 0d5278ca4777..76c86e7d5e10 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -657,7 +657,7 @@ int ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
void *user_icmph, size_t icmph_len) {
u8 type, code;
- if (len > 0xFFFF)
+ if (len > 0xFFFF || len < icmph_len)
return -EMSGSIZE;
/*