From patchwork Mon Apr 18 10:58:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 8870431 Return-Path: X-Original-To: patchwork-linux-wpan@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ED4079F443 for ; Mon, 18 Apr 2016 10:59:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9CCC20306 for ; Mon, 18 Apr 2016 10:59:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCDA020340 for ; Mon, 18 Apr 2016 10:59:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753722AbcDRK7V (ORCPT ); Mon, 18 Apr 2016 06:59:21 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:39698 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751583AbcDRK7U (ORCPT ); Mon, 18 Apr 2016 06:59:20 -0400 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=omega.localdomain) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1as6ti-0001TZ-Kp; Mon, 18 Apr 2016 12:59:18 +0200 From: Alexander Aring To: linux-wpan@vger.kernel.org Cc: kernel@pengutronix.de, marcel@holtmann.org, jukka.rissanen@linux.intel.com, hannes@stressinduktion.org, stefan@osg.samsung.com, mcr@sandelman.ca, werner@almesberger.net, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, Alexander Aring , "David S . Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy Subject: [PATCH bluetooth-next 05/10] ndisc: add addr_len parameter to ndisc_opt_addr_data Date: Mon, 18 Apr 2016 12:58:23 +0200 Message-Id: <1460977108-4675-6-git-send-email-aar@pengutronix.de> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1460977108-4675-1-git-send-email-aar@pengutronix.de> References: <1460977108-4675-1-git-send-email-aar@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: aar@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-wpan@vger.kernel.org Sender: linux-wpan-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wpan@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch makes the address length as argument for the ndisc_opt_addr_data function. This is necessary to handle addresses which don't use dev->addr_len as address length. Cc: David S. Miller Cc: Alexey Kuznetsov Cc: James Morris Cc: Hideaki YOSHIFUJI Cc: Patrick McHardy Signed-off-by: Alexander Aring --- include/net/ndisc.h | 5 +++-- net/ipv6/ndisc.c | 11 +++++++---- net/ipv6/route.c | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/net/ndisc.h b/include/net/ndisc.h index ef43e88..aac868e 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -134,12 +134,13 @@ static inline int ndisc_opt_addr_space(struct net_device *dev, } static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p, - struct net_device *dev) + struct net_device *dev, + unsigned char addr_len) { u8 *lladdr = (u8 *)(p + 1); int lladdrlen = p->nd_opt_len << 3; int prepad = ndisc_addr_option_pad(dev->type); - if (lladdrlen != ndisc_opt_addr_space(dev, dev->addr_len)) + if (lladdrlen != ndisc_opt_addr_space(dev, addr_len)) return NULL; return lladdr + prepad; } diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 69e20e3..4e91d5e 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -744,7 +744,8 @@ static void ndisc_recv_ns(struct sk_buff *skb) } if (ndopts.nd_opts_src_lladdr) { - lladdr = ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr, dev); + lladdr = ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr, dev, + dev->addr_len); if (!lladdr) { ND_PRINTK(2, warn, "NS: invalid link-layer address length\n"); @@ -916,7 +917,8 @@ static void ndisc_recv_na(struct sk_buff *skb) return; } if (ndopts.nd_opts_tgt_lladdr) { - lladdr = ndisc_opt_addr_data(ndopts.nd_opts_tgt_lladdr, dev); + lladdr = ndisc_opt_addr_data(ndopts.nd_opts_tgt_lladdr, dev, + dev->addr_len); if (!lladdr) { ND_PRINTK(2, warn, "NA: invalid link-layer address length\n"); @@ -1024,7 +1026,7 @@ static void ndisc_recv_rs(struct sk_buff *skb) if (ndopts.nd_opts_src_lladdr) { lladdr = ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr, - skb->dev); + skb->dev, skb->dev->addr_len); if (!lladdr) goto out; } @@ -1322,7 +1324,8 @@ skip_linkparms: u8 *lladdr = NULL; if (ndopts.nd_opts_src_lladdr) { lladdr = ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr, - skb->dev); + skb->dev, + skb->dev->addr_len); if (!lladdr) { ND_PRINTK(2, warn, "RA: invalid link-layer address length\n"); diff --git a/net/ipv6/route.c b/net/ipv6/route.c index ed44663..cc180b3 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2157,7 +2157,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu lladdr = NULL; if (ndopts.nd_opts_tgt_lladdr) { lladdr = ndisc_opt_addr_data(ndopts.nd_opts_tgt_lladdr, - skb->dev); + skb->dev, skb->dev->addr_len); if (!lladdr) { net_dbg_ratelimited("rt6_redirect: invalid link-layer address length\n"); return;