From nobody Thu Dec 18 13:07:55 2025 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 02B6BC32774 for ; Tue, 23 Aug 2022 08:24:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243344AbiHWIYj (ORCPT ); Tue, 23 Aug 2022 04:24:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243120AbiHWIUb (ORCPT ); Tue, 23 Aug 2022 04:20:31 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 582A26DFBC; Tue, 23 Aug 2022 01:12:04 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id A12CBB81C26; Tue, 23 Aug 2022 08:12:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9220C433C1; Tue, 23 Aug 2022 08:12:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661242321; bh=fntl2AQxwEntjTVQ0NGLc7DF/QeTA1ol4XdWPwNNzW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RGkTgze5jBRPKWl4kfqzYEXaB6l4h9JCDR4BuZKOx5xwhGGDZCBj164MwYDYfmLFe MqNvQ5uGgMpMWLNv9EL55zL103L18OVvnFQ24ZUvscW2u/9NlZvXNzu2oCUuRqgdRw ySuGa4Myiav5KM7h3CA24CRLoD84MbGZgNz+4IMo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hou Tao , Yonghong Song , Alexei Starovoitov Subject: [PATCH 5.19 067/365] bpf: Acquire map uref in .init_seq_private for sock{map,hash} iterator Date: Tue, 23 Aug 2022 09:59:28 +0200 Message-Id: <20220823080121.015734563@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Hou Tao commit f0d2b2716d71778d0b0c8eaa433c073287d69d93 upstream. sock_map_iter_attach_target() acquires a map uref, and the uref may be released before or in the middle of iterating map elements. For example, the uref could be released in sock_map_iter_detach_target() as part of bpf_link_release(), or could be released in bpf_map_put_with_uref() as part of bpf_map_release(). Fixing it by acquiring an extra map uref in .init_seq_private and releasing it in .fini_seq_private. Fixes: 0365351524d7 ("net: Allow iterating sockmap and sockhash") Signed-off-by: Hou Tao Acked-by: Yonghong Song Link: https://lore.kernel.org/r/20220810080538.1845898-5-houtao@huaweicloud= .com Signed-off-by: Alexei Starovoitov Signed-off-by: Greg Kroah-Hartman --- net/core/sock_map.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -783,13 +783,22 @@ static int sock_map_init_seq_private(voi { struct sock_map_seq_info *info =3D priv_data; =20 + bpf_map_inc_with_uref(aux->map); info->map =3D aux->map; return 0; } =20 +static void sock_map_fini_seq_private(void *priv_data) +{ + struct sock_map_seq_info *info =3D priv_data; + + bpf_map_put_with_uref(info->map); +} + static const struct bpf_iter_seq_info sock_map_iter_seq_info =3D { .seq_ops =3D &sock_map_seq_ops, .init_seq_private =3D sock_map_init_seq_private, + .fini_seq_private =3D sock_map_fini_seq_private, .seq_priv_size =3D sizeof(struct sock_map_seq_info), }; =20 @@ -1369,18 +1378,27 @@ static const struct seq_operations sock_ }; =20 static int sock_hash_init_seq_private(void *priv_data, - struct bpf_iter_aux_info *aux) + struct bpf_iter_aux_info *aux) { struct sock_hash_seq_info *info =3D priv_data; =20 + bpf_map_inc_with_uref(aux->map); info->map =3D aux->map; info->htab =3D container_of(aux->map, struct bpf_shtab, map); return 0; } =20 +static void sock_hash_fini_seq_private(void *priv_data) +{ + struct sock_hash_seq_info *info =3D priv_data; + + bpf_map_put_with_uref(info->map); +} + static const struct bpf_iter_seq_info sock_hash_iter_seq_info =3D { .seq_ops =3D &sock_hash_seq_ops, .init_seq_private =3D sock_hash_init_seq_private, + .fini_seq_private =3D sock_hash_fini_seq_private, .seq_priv_size =3D sizeof(struct sock_hash_seq_info), };