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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, 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 8E37FC433E1 for ; Wed, 29 Jul 2020 04:09:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F04D206D7 for ; Wed, 29 Jul 2020 04:09:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="dpERZJNO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725986AbgG2EJV (ORCPT ); Wed, 29 Jul 2020 00:09:21 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:53880 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726203AbgG2EJU (ORCPT ); Wed, 29 Jul 2020 00:09:20 -0400 Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06T49AQk032480 for ; Tue, 28 Jul 2020 21:09:20 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=facebook; bh=yJ4J/cxiW9BD8NOPqr/b2KGplF1ohYTOh7P63Vds3kc=; b=dpERZJNOU7NcxO/UIwZ4e9i6Y/jUVhVp8M8mhZDORL5Y916wnSertCJSP2FJ1Hq23XZD cMD4D3MOQwsMrtc3a0XjtgjMaF1yBM2co/2vDr2ow+UlouEMZdvUJGXNvDFwwiAHE+7a QA6WhdiBtuuNHrLGt8Om6viD+rd9Ta7kplI= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 32h4q9n5gq-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 28 Jul 2020 21:09:20 -0700 Received: from intmgw001.08.frc2.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 28 Jul 2020 21:09:18 -0700 Received: by devbig012.ftw2.facebook.com (Postfix, from userid 137359) id 81FF52EC4C8E; Tue, 28 Jul 2020 21:09:14 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Andrii Nakryiko Smtp-Origin-Hostname: devbig012.ftw2.facebook.com To: , , , CC: , , Andrii Nakryiko , Song Liu , Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH v4 bpf 1/2] bpf: fix map leak in HASH_OF_MAPS map Date: Tue, 28 Jul 2020 21:09:12 -0700 Message-ID: <20200729040913.2815687-1-andriin@fb.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-07-29_02:2020-07-28,2020-07-29 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 spamscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 mlxlogscore=910 malwarescore=0 adultscore=0 phishscore=0 mlxscore=0 priorityscore=1501 bulkscore=0 suspectscore=25 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2007290028 X-FB-Internal: deliver Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Fix HASH_OF_MAPS bug of not putting inner map pointer on bpf_map_elem_upd= ate() operation. This is due to per-cpu extra_elems optimization, which bypasse= d free_htab_elem() logic doing proper clean ups. Make sure that inner map i= s put properly in optimized case as well. Fixes: 8c290e60fa2a ("bpf: fix hashmap extra_elems logic") Acked-by: Song Liu Cc: # v4.14+ Signed-off-by: Andrii Nakryiko --- kernel/bpf/hashtab.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index b4b288a3c3c9..b32cc8ce8ff6 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -779,15 +779,20 @@ static void htab_elem_free_rcu(struct rcu_head *hea= d) htab_elem_free(htab, l); } =20 -static void free_htab_elem(struct bpf_htab *htab, struct htab_elem *l) +static void htab_put_fd_value(struct bpf_htab *htab, struct htab_elem *l= ) { struct bpf_map *map =3D &htab->map; + void *ptr; =20 if (map->ops->map_fd_put_ptr) { - void *ptr =3D fd_htab_map_get_ptr(map, l); - + ptr =3D fd_htab_map_get_ptr(map, l); map->ops->map_fd_put_ptr(ptr); } +} + +static void free_htab_elem(struct bpf_htab *htab, struct htab_elem *l) +{ + htab_put_fd_value(htab, l); =20 if (htab_is_prealloc(htab)) { __pcpu_freelist_push(&htab->freelist, &l->fnode); @@ -839,6 +844,7 @@ static struct htab_elem *alloc_htab_elem(struct bpf_h= tab *htab, void *key, */ pl_new =3D this_cpu_ptr(htab->extra_elems); l_new =3D *pl_new; + htab_put_fd_value(htab, old_elem); *pl_new =3D old_elem; } else { struct pcpu_freelist_node *l; --=20 2.24.1