Message ID | 20200601174032.067230223@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=Ycwd=7O=vger.kernel.org=stable-owner@kernel.org> 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 E1B38C433E1 for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:06:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9F65216FD for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:06:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034777; bh=MHhoDb4aBCD9KWdk6AnjkkcArggnIDlf2IWDJon8x3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JALs0wNwRvkWJ1wJYXoNPE34GOStVNVuMTw8EswWuxuGJfzbXJP1FcuFjSmNktRvm YheK/o3SK18uiDM0S4RfDhqjzy/vS7ih2wiRDRcLeV9ts8Z1rl6Dx51MHEW3jLpDrc To/wamBpkd3Ue3/DdUMi6IBKBO1L+Wsf4l1ohLQw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730432AbgFASGQ (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 1 Jun 2020 14:06:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:51678 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730429AbgFASGP (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 1 Jun 2020 14:06:15 -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 7FF1B207D0; Mon, 1 Jun 2020 18:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034775; bh=MHhoDb4aBCD9KWdk6AnjkkcArggnIDlf2IWDJon8x3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RMA1RXIIJQ73XZtL/7iO0QaRssuWb7Ayb8+4FEccPabufDmrL7lMM9t3ZDfkAvyMq sg/U46ScSpt+d/AGGnlJrIIljgNAW6Jy6rF1IV5BaOE4idGdA39C9AAUO3puRfCLcM oVKkktkJucU7ploT3PakJkYSgCa1d0PL53w5ZoTg= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Simon Wunderlich <sw@simonwunderlich.de>, =?utf-8?q?Linus_L=C3=BCssing?= <ll@simonwunderlich.de>, Johannes Berg <johannes.berg@intel.com> Subject: [PATCH 4.19 72/95] mac80211: mesh: fix discovery timer re-arming issue / crash Date: Mon, 1 Jun 2020 19:54:12 +0200 Message-Id: <20200601174032.067230223@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174020.759151073@linuxfoundation.org> References: <20200601174020.759151073@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: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -1088,7 +1088,14 @@ void mesh_path_start_discovery(struct ie mesh_path_sel_frame_tx(MPATH_PREQ, 0, sdata->vif.addr, ifmsh->sn, target_flags, mpath->dst, mpath->sn, da, 0, ttl, lifetime, 0, ifmsh->preq_id++, sdata); + + spin_lock_bh(&mpath->state_lock); + if (mpath->flags & MESH_PATH_DELETED) { + spin_unlock_bh(&mpath->state_lock); + goto enddiscovery; + } mod_timer(&mpath->timer, jiffies + mpath->discovery_timeout); + spin_unlock_bh(&mpath->state_lock); enddiscovery: rcu_read_unlock();