From patchwork Mon Jul 2 20:32:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 938172 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="1+0AreKL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41KJpL1hc6z9s3C for ; Tue, 3 Jul 2018 06:32:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752672AbeGBUcT (ORCPT ); Mon, 2 Jul 2018 16:32:19 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:51089 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752579AbeGBUcR (ORCPT ); Mon, 2 Jul 2018 16:32:17 -0400 Received: by mail-it0-f65.google.com with SMTP id u4-v6so130796itg.0 for ; Mon, 02 Jul 2018 13:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=CROXa6TVDDKnefY1VmU2CrtV7TryFJaJ7EedxyxeVYs=; b=1+0AreKLCK6ugnuD0Tedqr/oGf1Qx1oBS725j71fA63mikSAr+pdYjoac3z1cNkt27 7W3X5KqWz0PCoN3n5TL/YIuJ0c0eYKmrbHlsWRSb54mU70T8b9JeMX9848clA/irtY4B COCASHUHA7HK4ZfTopi5thDsu2Y2B+Ogp2Ww0PelVMPZJ6MUXolUTcJGwAw25KPKD7X6 H44fdzhr9V76zDErnw832Q+tOD7w7XUmOYV6ioWPt+iOWJsuYZWNDK9zTWLoEZ0dMwJc DpSPRLOfqr7oW3qAABHwC+n6nSAYgqnvuAhsS2P7kC2p4l7kIKXiiUMWsuGOwOdKcCvi bYpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CROXa6TVDDKnefY1VmU2CrtV7TryFJaJ7EedxyxeVYs=; b=Kzcj3jPme2gBGTtzzPG42sq4MzJUP5hFHvEBuK2prmUT4Z5FyvehLqievw+j5bIsoj lsN2jKA0l5oNngPt6SBtvs8icet1Pdu0ovZTMgDqMdbKlxa6vLNRKBZVEy+Fl+sIUFQe X8tFqtPlDo9w5SyRgazcq70nDWCW0LwPHPMLq/GqYUy6zjO2Hhg9vuA5OCgUWYfcKqlK mMKAUSZ4suMI/OGJmnYRKdZ1jTXwCa4o98PVrjVUFaHb23WZr94g8+7H5KR6Bn6z6HKg 6KQEzSmpA0BiE3h1FrQTJ4Ldopmk8aQbA4UEtx8/Y124F/LOAIsSN7UYttAfhXl5YrY/ /OrQ== X-Gm-Message-State: APt69E1bIC3jmuPS/Avn7NP2LAiHzyxRvdMrUp6uRQj1unAhQytdvC1W 8Q3TDDFu5yNz0iTb1Oik8W7osA== X-Google-Smtp-Source: AAOMgpewHQsTr0rHnUcRQNnPA8SWxIgmZjIbx+w1jw3gvLqIWgTwAm48OftnYiSZvvVFOWEawdKdzw== X-Received: by 2002:a24:4112:: with SMTP id x18-v6mr7054633ita.83.1530563535726; Mon, 02 Jul 2018 13:32:15 -0700 (PDT) Received: from x220t.lan ([64.26.149.125]) by smtp.gmail.com with ESMTPSA id h75-v6sm725562ioh.50.2018.07.02.13.32.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jul 2018 13:32:14 -0700 (PDT) From: Alexander Aring To: stefan@osg.samsung.com Cc: linux-wpan@vger.kernel.org, netdev@vger.kernel.org, kernel@mojatatu.com, Alexander Aring Subject: [PATCH wpan 1/2] net: 6lowpan: fix reserved space for single frames Date: Mon, 2 Jul 2018 16:32:02 -0400 Message-Id: <20180702203203.21316-1-aring@mojatatu.com> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes patch add handling to take care tail and headroom for single 6lowpan frames. We need to be sure we have a skb with the right head and tailroom for single frames. This patch do it by using skb_copy_expand() if head and tailroom is not enough allocated by upper layer. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=195059 Reported-by: David Palma Reported-by: Rabi Narayan Sahoo Signed-off-by: Alexander Aring --- net/ieee802154/6lowpan/tx.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/net/ieee802154/6lowpan/tx.c b/net/ieee802154/6lowpan/tx.c index e6ff5128e61a..d0c4d220de08 100644 --- a/net/ieee802154/6lowpan/tx.c +++ b/net/ieee802154/6lowpan/tx.c @@ -265,9 +265,24 @@ netdev_tx_t lowpan_xmit(struct sk_buff *skb, struct net_device *ldev) /* We must take a copy of the skb before we modify/replace the ipv6 * header as the header could be used elsewhere */ - skb = skb_unshare(skb, GFP_ATOMIC); - if (!skb) - return NET_XMIT_DROP; + if (unlikely(skb_headroom(skb) < ldev->needed_headroom || + skb_tailroom(skb) < ldev->needed_tailroom)) { + struct sk_buff *nskb; + + nskb = skb_copy_expand(skb, ldev->needed_headroom, + ldev->needed_tailroom, GFP_ATOMIC); + if (likely(skb)) { + consume_skb(skb); + skb = nskb; + } else { + kfree_skb(skb); + return NET_XMIT_DROP; + } + } else { + skb = skb_unshare(skb, GFP_ATOMIC); + if (!skb) + return NET_XMIT_DROP; + } ret = lowpan_header(skb, ldev, &dgram_size, &dgram_offset); if (ret < 0) { From patchwork Mon Jul 2 20:32:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 938171 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="v3wsxPRo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41KJpH454Gz9s2g for ; Tue, 3 Jul 2018 06:32:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752768AbeGBUcU (ORCPT ); Mon, 2 Jul 2018 16:32:20 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:37750 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752580AbeGBUcS (ORCPT ); Mon, 2 Jul 2018 16:32:18 -0400 Received: by mail-it0-f65.google.com with SMTP id p17-v6so114166itc.2 for ; Mon, 02 Jul 2018 13:32:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vqDi/WTzreuRfVy5LMGoCvq5fEVvTRmMSN+N5Ws23mY=; b=v3wsxPRoEyy7DGCdQ83DhKJ12AUJddcWO3/l3K7CJcXN+hJfAObfMOy7r/V4xMSwWo aUxOAwUDLcuMwh2hPhXB0WSpfJqgOhZxx8BqjwJD9HQ0uz06q4Qg/jn66oiz4/y24Lut zyP0hGnIA2SjIucJ39p5qBQ8Y/RauBP8EB+a3PvspmSzzU8RvQoRg7Wgnu9N0WP+87yp KIFjC3na2Okt6oyaF0kwiKVZ2Z9Prwxjw61UKlaMkXP8/EzGSd0ocaVEO8gbKzRMliXZ NEo4XJaGG2NOeAOqI8Sonl0L3/MAQAPWavetpwnr+7DhWmTD7tFZA+kWIrhiz4LWYMLN 9VYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vqDi/WTzreuRfVy5LMGoCvq5fEVvTRmMSN+N5Ws23mY=; b=mvNtV6uAshOyRTJhjamisn22gEFWJD6uZGM3p6b32lJcrKrLrpKwb2ZX1ghrizJZ16 XJgyNQM6lUA9Ce7AKyd2NmXwp3Z3Fr1wJSxI958JjZJZcAq+NS/dp1SybrLkcI1f1U7f P3Y8O4zd8hfWW8TDgW5/CMp4cPggeV+328dFD/Ab/qf4Vhs2FkKx6Ej2Zoj1O8CBl0Bx jyLvk7p6s3DvCrXLmykgKBz+4kkqrK2B8Py8mHzBW6bprVzdbIzVvJM/vjEjKKX8VT8a WwixD29AcVMKq02EFaVe8GY0s4VWWUpsE67/imL0+2Om8AbbkZeLYOWLQtISe/O+DYhM c3sQ== X-Gm-Message-State: APt69E2kpopihWqtwRNYa1GyyxnJ/6MdpAK2DgmHRG+fG17apQiT7rxf Bam/jmlSphy9tNk/f7QwjlHXsA== X-Google-Smtp-Source: AAOMgpeCE6HrYMrjIA+nRsDxGx5WmEmWKX6JrCQdPxTQKZ4Jx1ITod+2QrWr7RtUy5byKaK9MxTjvQ== X-Received: by 2002:a24:1a17:: with SMTP id 23-v6mr7229857iti.149.1530563537146; Mon, 02 Jul 2018 13:32:17 -0700 (PDT) Received: from x220t.lan ([64.26.149.125]) by smtp.gmail.com with ESMTPSA id h75-v6sm725562ioh.50.2018.07.02.13.32.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jul 2018 13:32:16 -0700 (PDT) From: Alexander Aring To: stefan@osg.samsung.com Cc: linux-wpan@vger.kernel.org, netdev@vger.kernel.org, kernel@mojatatu.com, Alexander Aring Subject: [PATCH wpan 2/2] net: mac802154: tx: expand tailroom if necessary Date: Mon, 2 Jul 2018 16:32:03 -0400 Message-Id: <20180702203203.21316-2-aring@mojatatu.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180702203203.21316-1-aring@mojatatu.com> References: <20180702203203.21316-1-aring@mojatatu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch is necessary if case of AF_PACKET or other socket interface which I am aware of it and didn't allocated the necessary room. Reported-by: David Palma Reported-by: Rabi Narayan Sahoo Signed-off-by: Alexander Aring --- net/mac802154/tx.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index 7e253455f9dd..bcd1a5e6ebf4 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -63,8 +63,21 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb) int ret; if (!(local->hw.flags & IEEE802154_HW_TX_OMIT_CKSUM)) { - u16 crc = crc_ccitt(0, skb->data, skb->len); + struct sk_buff *nskb; + u16 crc; + + if (unlikely(skb_tailroom(skb) < IEEE802154_FCS_LEN)) { + nskb = skb_copy_expand(skb, 0, IEEE802154_FCS_LEN, + GFP_ATOMIC); + if (likely(nskb)) { + consume_skb(skb); + skb = nskb; + } else { + goto err_tx; + } + } + crc = crc_ccitt(0, skb->data, skb->len); put_unaligned_le16(crc, skb_put(skb, 2)); }