From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2557C76186 for ; Wed, 24 Jul 2019 19:33:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F35821951 for ; Wed, 24 Jul 2019 19:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563996831; bh=GrVsrM3NjNGREcJwnL+NGv1B65Ib17x0rVucDc+1WS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xZseuSSSTtIIxFMEmO6MRV1QIAGQZTLhxX18daV1qlbWgqJgi8+qvs9Jk71mF4uIt uFBg04gTJrU+gEM8IIOaiZVzQcQHviob41JZQ63oxfSy6+VcREKGLa/rLFVIQ3TmNW x5dc5w0tgF0yGt2QFoY3S3vt/IhHo8HpoSjfHMV4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388955AbfGXTdu (ORCPT ); Wed, 24 Jul 2019 15:33:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:55806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388132AbfGXTdu (ORCPT ); Wed, 24 Jul 2019 15:33:50 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EF05420659; Wed, 24 Jul 2019 19:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563996829; bh=GrVsrM3NjNGREcJwnL+NGv1B65Ib17x0rVucDc+1WS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uistiiim/PHHX09BPEHzU5W3bA1Isie8P8bCHYdiIyplP8Yqidn11bfAvqQTVu83R MLahlDKfhszB+czpWcsBqzXkWrfb7its/tXrXBdLhetVa5u+YBW0XbEkVCvf8tpddL aGlGzwP3A17gy/G/qkko7tVzsubE6BeCjrYEb/SI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jukka Rissanen , Michael Scott , Josua Mayer , Marcel Holtmann , Sasha Levin Subject: [PATCH 5.2 231/413] Bluetooth: 6lowpan: search for destination address in all peers Date: Wed, 24 Jul 2019 21:18:42 +0200 Message-Id: <20190724191751.605698017@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit b188b03270b7f8568fc714101ce82fbf5e811c5a ] Handle overlooked case where the target address is assigned to a peer and neither route nor gateway exist. For one peer, no checks are performed to see if it is meant to receive packets for a given address. As soon as there is a second peer however, checks are performed to deal with routes and gateways for handling complex setups with multiple hops to a target address. This logic assumed that no route and no gateway imply that the destination address can not be reached, which is false in case of a direct peer. Acked-by: Jukka Rissanen Tested-by: Michael Scott Signed-off-by: Josua Mayer Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- net/bluetooth/6lowpan.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c index 1555b0c6f7ec..9001bf331d56 100644 --- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c @@ -180,10 +180,16 @@ static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_btle_dev *dev, } if (!rt) { - nexthop = &lowpan_cb(skb)->gw; - - if (ipv6_addr_any(nexthop)) - return NULL; + if (ipv6_addr_any(&lowpan_cb(skb)->gw)) { + /* There is neither route nor gateway, + * probably the destination is a direct peer. + */ + nexthop = daddr; + } else { + /* There is a known gateway + */ + nexthop = &lowpan_cb(skb)->gw; + } } else { nexthop = rt6_nexthop(rt, daddr); -- 2.20.1