From 9772310df1aafd76e38d0e5992111e79974e8bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 16 Nov 2008 19:48:49 -0800 Subject: [PATCH] --- yaml --- r: 119097 b: refs/heads/master c: ebfe92ca65c780334bdf847ddc4eca15835bd9c0 h: refs/heads/master i: 119095: eaa96b354e6c5e064c5a958726d23c62cf21d11c v: v3 --- [refs] | 2 +- trunk/net/phonet/af_phonet.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b626cb147956..352de02ac838 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb7c3adb1ca92450870dbb0d347fc986cd5e2af4 +refs/heads/master: ebfe92ca65c780334bdf847ddc4eca15835bd9c0 diff --git a/trunk/net/phonet/af_phonet.c b/trunk/net/phonet/af_phonet.c index defeb7a0d502..7ab30f668b5a 100644 --- a/trunk/net/phonet/af_phonet.c +++ b/trunk/net/phonet/af_phonet.c @@ -144,8 +144,8 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev, struct phonethdr *ph; int err; - if (skb->len + 2 > 0xffff) { - /* Phonet length field would overflow */ + if (skb->len + 2 > 0xffff /* Phonet length field limit */ || + skb->len + sizeof(struct phonethdr) > dev->mtu) { err = -EMSGSIZE; goto drop; }