From patchwork Fri Mar 14 20:24:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phoebe Buckheister X-Patchwork-Id: 330485 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5E5032C00C5 for ; Sat, 15 Mar 2014 07:24:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755526AbaCNUYP (ORCPT ); Fri, 14 Mar 2014 16:24:15 -0400 Received: from selenium.quasiparticle.net ([188.40.96.248]:52627 "EHLO quasiparticle.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755087AbaCNUYL (ORCPT ); Fri, 14 Mar 2014 16:24:11 -0400 Received: from chcordaihkh.rse (unknown [10.1.0.3]) by quasiparticle.net (Postfix) with ESMTP id CC1EA22600; Fri, 14 Mar 2014 21:24:09 +0100 (CET) From: Phoebe Buckheister To: netdev@vger.kernel.org Cc: linux-zigbee-devel@lists.sourceforge.net, davem@davemloft.net, Phoebe Buckheister Subject: [PATCH net-next v2 8/8] ieee802154: add proper length checks to header creations Date: Fri, 14 Mar 2014 21:24:04 +0100 Message-Id: <1394828644-19898-9-git-send-email-phoebe.buckheister@itwm.fraunhofer.de> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1394828644-19898-1-git-send-email-phoebe.buckheister@itwm.fraunhofer.de> References: <1394828644-19898-1-git-send-email-phoebe.buckheister@itwm.fraunhofer.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- net/ieee802154/6lowpan_rtnl.c | 2 +- net/ieee802154/dgram.c | 2 +- net/mac802154/wpan.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c index d4edd20..6060394 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, } return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev, - type, (void *)&da, (void *)&sa, skb->len); + type, (void *)&da, (void *)&sa, 0); } static int lowpan_give_skb_to_devices(struct sk_buff *skb, diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c index 55f2dc4..4c47154 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, if (size > mtu) { pr_debug("size = %Zu, mtu = %u\n", size, mtu); - err = -EINVAL; + err = -EMSGSIZE; goto out_dev; } diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c index b614266..80cbee1 100644 --- a/net/mac802154/wpan.c +++ b/net/mac802154/wpan.c @@ -150,6 +150,9 @@ static int mac802154_header_create(struct sk_buff *skb, skb_reset_mac_header(skb); skb->mac_len = hlen; + if (hlen + len + 2 > dev->mtu) + return -EMSGSIZE; + return hlen; }