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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 647C6C4332D for ; Wed, 18 Mar 2020 21:00:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B94720409 for ; Wed, 18 Mar 2020 21:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584565220; bh=wyE376WqgvY5+rrlCpPW+hpOOpimfMKEWWvfWaIqJoM=; h=From:To:Cc:Subject:Date:List-ID:From; b=Q88TK2uCvjcyCsPjrxVTwBinUngeFne4Spe1efd1q7ZIh17l4sKDMMB77SH+Wf5pj 4Bzuv8YOjLd7laPzLIZx0MdHE3iQJGp8oEK4ciI4zkVrarJbGAP0IgpEoAsZeayHMk UF5qiAi5knqppm0iKE+HUYOd/DhlEk2UkoLfnOHQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728172AbgCRU4h (ORCPT ); Wed, 18 Mar 2020 16:56:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:57564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728098AbgCRU4c (ORCPT ); Wed, 18 Mar 2020 16:56:32 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 76354208CA; Wed, 18 Mar 2020 20:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564991; bh=wyE376WqgvY5+rrlCpPW+hpOOpimfMKEWWvfWaIqJoM=; h=From:To:Cc:Subject:Date:From; b=swtQRAISRCV+OWWMMt+vf5z1y9wFz6aK0MbHqXzI653Mf9mIXK6dXZ3sOMD6y5JbB gOuGNrm/klU97It+SI/FtXKpmsyqlyyuhIEgA5e3sVea/uOYPyegvfJdJWCWtTh/Fn DFvyP6//+n788MsxivuHANJ6QWxqNo2SDz4fO/Ls= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sven Eckelmann , syzbot+a98f2016f40b9cd3818a@syzkaller.appspotmail.com, syzbot+ac36b6a33c28a491e929@syzkaller.appspotmail.com, Hillf Danton , Simon Wunderlich , Sasha Levin , b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 01/15] batman-adv: Don't schedule OGM for disabled interface Date: Wed, 18 Mar 2020 16:56:15 -0400 Message-Id: <20200318205629.17750-1-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sven Eckelmann [ Upstream commit 8e8ce08198de193e3d21d42e96945216e3d9ac7f ] A transmission scheduling for an interface which is currently dropped by batadv_iv_ogm_iface_disable could still be in progress. The B.A.T.M.A.N. V is simply cancelling the workqueue item in an synchronous way but this is not possible with B.A.T.M.A.N. IV because the OGM submissions are intertwined. Instead it has to stop submitting the OGM when it detect that the buffer pointer is set to NULL. Reported-by: syzbot+a98f2016f40b9cd3818a@syzkaller.appspotmail.com Reported-by: syzbot+ac36b6a33c28a491e929@syzkaller.appspotmail.com Fixes: c6c8fea29769 ("net: Add batman-adv meshing protocol") Signed-off-by: Sven Eckelmann Cc: Hillf Danton Signed-off-by: Simon Wunderlich Signed-off-by: Sasha Levin --- net/batman-adv/bat_iv_ogm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 780700fcbe63e..b08e3b331c503 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -934,6 +934,10 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED)) return; + /* interface already disabled by batadv_iv_ogm_iface_disable */ + if (!*ogm_buff) + return; + /* the interface gets activated here to avoid race conditions between * the moment of activating the interface in * hardif_activate_interface() where the originator mac is set and -- 2.20.1