diff options
author | Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> | 2014-03-14 16:24:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-14 22:15:26 -0400 |
commit | d1d7358e9f032a43bd48d56a623943b7bee7dce0 (patch) | |
tree | 9e132ac257c7f520382d7082e34ab3f5f1cc9452 /net/ieee802154 | |
parent | a13061ec04e9168625427a591235b167d5499bc6 (diff) |
ieee802154: add proper length checks to header creations
Have mac802154 header_ops.create fail with -EMSGSIZE if the length
passed will be too large to fit a frame. Since 6lowpan will ensure that
no packet payload will be too large, pass a length of 0 there. 802.15.4
dgram sockets will also return -EMSGSIZE on payloads larger than the
device MTU instead of -EINVAL.
Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ieee802154')
-rw-r--r-- | net/ieee802154/6lowpan_rtnl.c | 2 | ||||
-rw-r--r-- | net/ieee802154/dgram.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c index d4edd20dab5f..606039442a59 100644 --- a/net/ieee802154/6lowpan_rtnl.c +++ b/net/ieee802154/6lowpan_rtnl.c | |||
@@ -141,7 +141,7 @@ static int lowpan_header_create(struct sk_buff *skb, | |||
141 | } | 141 | } |
142 | 142 | ||
143 | return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev, | 143 | return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev, |
144 | type, (void *)&da, (void *)&sa, skb->len); | 144 | type, (void *)&da, (void *)&sa, 0); |
145 | } | 145 | } |
146 | 146 | ||
147 | static int lowpan_give_skb_to_devices(struct sk_buff *skb, | 147 | static int lowpan_give_skb_to_devices(struct sk_buff *skb, |
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c index 55f2dc45a7dc..4c47154041b0 100644 --- a/net/ieee802154/dgram.c +++ b/net/ieee802154/dgram.c | |||
@@ -233,7 +233,7 @@ static int dgram_sendmsg(struct kiocb *iocb, struct sock *sk, | |||
233 | 233 | ||
234 | if (size > mtu) { | 234 | if (size > mtu) { |
235 | pr_debug("size = %Zu, mtu = %u\n", size, mtu); | 235 | pr_debug("size = %Zu, mtu = %u\n", size, mtu); |
236 | err = -EINVAL; | 236 | err = -EMSGSIZE; |
237 | goto out_dev; | 237 | goto out_dev; |
238 | } | 238 | } |
239 | 239 | ||