From patchwork Sun Dec 23 17:52:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Willem de Bruijn X-Patchwork-Id: 1018067 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rfym3OtI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43N91c3nR6z9sCr for ; Mon, 24 Dec 2018 04:52:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725773AbeLWRwX (ORCPT ); Sun, 23 Dec 2018 12:52:23 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:38840 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725308AbeLWRwX (ORCPT ); Sun, 23 Dec 2018 12:52:23 -0500 Received: by mail-qt1-f194.google.com with SMTP id p17so11282976qtl.5 for ; Sun, 23 Dec 2018 09:52:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=czE4t/bMoT82ahCq4UWH2hHVQvwNGyZ/1qGINNwvqMg=; b=rfym3OtIuh91payFe1Fr1Kfr+FZ+D1zxx6ifDrdSG4yAAFcJxxmYU3h5RQ+/8Hzo5k PS+NhxlAk0gPjcd3y2vGsXshjcTeSHT5wi8iN/r07b0zr78uVzgAsocCPHPxT+txwKZG uJzcVGbQt6+An0F0JqGnMearOj6V9NHIPk6sH9t/TZkFaX+jqIT5yKyqN4OuLMsYny8K UB6FnM6uDQaBJouVu4ghmYDRS4pNC/v1xz9STOqDR+uGemWLjrCqhUid0UQWrwwkO/sh FUQoM2N7ypI2AWT0/tL43YTKJ0pjvSy7AbSjobHe53Le2ZQv0n5UqYrP6nHxwajqTi/i T/kg== 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:mime-version :content-transfer-encoding; bh=czE4t/bMoT82ahCq4UWH2hHVQvwNGyZ/1qGINNwvqMg=; b=mpbFAVdJfRQI4DJzEPVi1sB7YpcahwDf3PKbWT4qiB1weci/q24sAAxNf2rZr8emca QRIYMjDdEuwlbE1Yo/Tm0MYr+oTrXbE/GlsUSwO+AvMzwhja9H4KyUxNyx75uxR1nTyT oUu3l6dVbYCMtck/zk0lddbOxvDFMJW6SOGErRD0devRgPjfgNxRTSfMBl/+NIq/ONSh 0FKHwesHau3r4uTE9O7V08jSjxxtCISk2kTZf+NIX94VMrbxmfCtLjYc7cfKtbmSfknU vCuR5fEY0aX1N2iEwhRlzYtKmyQpzzU2iIVPrCMrhNMq+LVLtxZpMzmKTi+CeMXzMd9n jkpw== X-Gm-Message-State: AJcUukfLbuN3LNcghts2QaZf9IfGFvqYz0MKJf8YrlYzxuXq72hXy/cw yC0SBAIypllXGEh20rZJr3QIQbDg X-Google-Smtp-Source: ALg8bN5aeqUdQQbDhhYtwbxUNtXoI8UaGGwbGKCbDeLgnh92cdNcSj68F9AXw2xKtGCBBgwd8mfnlQ== X-Received: by 2002:a0c:d933:: with SMTP id p48mr9881779qvj.15.1545587541830; Sun, 23 Dec 2018 09:52:21 -0800 (PST) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id o42sm10816689qtc.90.2018.12.23.09.52.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 09:52:20 -0800 (PST) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: davem@davemloft.net, alex.aring@gmail.com, jukka.rissanen@linux.intel.com, Willem de Bruijn Subject: [PATCH net] ieee802154: lowpan_header_create check must check daddr Date: Sun, 23 Dec 2018 12:52:18 -0500 Message-Id: <20181223175218.165576-1-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.20.1.415.g653613c723-goog MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn Packet sockets may call dev_header_parse with NULL daddr. Make lowpan_header_ops.create fail. Fixes: 87a93e4eceb4 ("ieee802154: change needed headroom/tailroom") Signed-off-by: Willem de Bruijn Acked-by: Alexander Aring --- Re: function comment on packet socket address length: that is (now) verified to be at least dev->addr_len. It is customary to return -header_len on failure in .create(), but not sure what that would be here, and any negative value is treated the same by callers, so returning -EINVAL. Is the return 0 on !ETH_P_IPV6 intentional, or should that also be negative? --- net/ieee802154/6lowpan/tx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ieee802154/6lowpan/tx.c b/net/ieee802154/6lowpan/tx.c index ca53efa17be1..8bec827081cd 100644 --- a/net/ieee802154/6lowpan/tx.c +++ b/net/ieee802154/6lowpan/tx.c @@ -48,6 +48,9 @@ int lowpan_header_create(struct sk_buff *skb, struct net_device *ldev, const struct ipv6hdr *hdr = ipv6_hdr(skb); struct neighbour *n; + if (!daddr) + return -EINVAL; + /* TODO: * if this package isn't ipv6 one, where should it be routed? */