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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA162C433EF for ; Mon, 27 Dec 2021 19:07:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232561AbhL0THc (ORCPT ); Mon, 27 Dec 2021 14:07:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230510AbhL0TGd (ORCPT ); Mon, 27 Dec 2021 14:06:33 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28D1EC061799; Mon, 27 Dec 2021 11:06:27 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BD65260FB2; Mon, 27 Dec 2021 19:06:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2875AC36AEB; Mon, 27 Dec 2021 19:06:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1640631986; bh=i8dUo/y+EbHI9vxyKcyYErmJlayGx+Ao61cERPKxU6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GPocOxakIAt9mxsunBQXlELbS5VwuTyzFdSTc6w9Ow9KMBppLn6NwAewsjjGndShG XeblBSq+VZ33iGqrGSVmVlNwRqToblJsjaiINq3YpPTOi6DLGybpWeJ8gTzbzSqyvf xUyA7lZi5BT7F80U+8QlBEA3+S1qWwYBnNY2cDx0amSmo1fbRV0gLKYfD+7fWg5AE9 LezaUVVlDHXZa0OkVkICBjQFiowYXEUhrAC/uLM638gXTuR1UjTbltmxrSNtiDsM7s 5ihIK8aNUTDd2/IzUVpzYvaRC+2B/Oun8HgR7OKTAIXpZDmk4iU03QxepOYWi9nIfC mlZmWTlOlQG9Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lin Ma , Hanjie Wu , "David S . Miller" , Sasha Levin , jreuter@yaina.de, kuba@kernel.org, linux-hams@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 4/6] ax25: NPD bug when detaching AX25 device Date: Mon, 27 Dec 2021 14:06:08 -0500 Message-Id: <20211227190615.1043350-4-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211227190615.1043350-1-sashal@kernel.org> References: <20211227190615.1043350-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lin Ma [ Upstream commit 1ade48d0c27d5da1ccf4b583d8c5fc8b534a3ac8 ] The existing cleanup routine implementation is not well synchronized with the syscall routine. When a device is detaching, below race could occur. static int ax25_sendmsg(...) { ... lock_sock() ax25 = sk_to_ax25(sk); if (ax25->ax25_dev == NULL) // CHECK ... ax25_queue_xmit(skb, ax25->ax25_dev->dev); // USE ... } static void ax25_kill_by_device(...) { ... if (s->ax25_dev == ax25_dev) { s->ax25_dev = NULL; ... } Other syscall functions like ax25_getsockopt, ax25_getname, ax25_info_show also suffer from similar races. To fix them, this patch introduce lock_sock() into ax25_kill_by_device in order to guarantee that the nullify action in cleanup routine cannot proceed when another socket request is pending. Signed-off-by: Hanjie Wu Signed-off-by: Lin Ma Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ax25/af_ax25.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index a45db78eaf00a..567fdfd9678d5 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -88,8 +88,10 @@ static void ax25_kill_by_device(struct net_device *dev) again: ax25_for_each(s, &ax25_list) { if (s->ax25_dev == ax25_dev) { - s->ax25_dev = NULL; spin_unlock_bh(&ax25_list_lock); + lock_sock(s->sk); + s->ax25_dev = NULL; + release_sock(s->sk); ax25_disconnect(s, ENETUNREACH); spin_lock_bh(&ax25_list_lock); -- 2.34.1