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 76478ECAAD3 for ; Sat, 10 Sep 2022 20:17:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229502AbiIJURB (ORCPT ); Sat, 10 Sep 2022 16:17:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbiIJURA (ORCPT ); Sat, 10 Sep 2022 16:17:00 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 391E63ECD8 for ; Sat, 10 Sep 2022 13:16:59 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id g4-20020aa78184000000b0053e70e333c6so2980053pfi.2 for ; Sat, 10 Sep 2022 13:16:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=4va1A6Pg2FoWWuqwQXukPIMsWe3nsr0ZDePQdQ01AZ4=; b=a8tWm/37FKsRqQy7rz4vFhHqkt1oTaqUqWqMfxuj4Z3PoNBLQ8k6sVoudqZrELblra HElCNtZueoE1bRj2S/RCGKVvxUzozHNgxCWata8SWq/FHW2JoFE6VUOyRiQNl12sJr1P 0vYow+f0EgaA0hNRQdfHHT9I9U9GN5RPsvYp1e1V4c+KaZnmoZaf4J/WQsoK1me8VkSZ /97RJjYKFLznSkZw4NzBWMI30ADKK25J1P0U10ak/tcA377oD7A8USzZavkKVY6tyQhu Q9rFMgNpzbTNSPj23CImAWV6Y9kEhUxHC1IOuTr9LdBpubPZcKj5DGNwUSFWzWeI1wk2 nBSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=4va1A6Pg2FoWWuqwQXukPIMsWe3nsr0ZDePQdQ01AZ4=; b=RdfHrUr6q6X9CtiFx6ImIgalyC5Vulnx8k0AGDU3KK4h+PNlVoRO05N6NLli5Fl+Ua 0S3kzTsrMjL7O/A5m1Clx//SxWFslWNsGlZ+l9+ZlmTdR6VJvrgwclNVmxcgmmm+Kifu HKzv6AxN80RUebZIgLTS0V0Apt5RCcyXVpYnG8GKVHZ6PymRZIfiF1FjdtHc6iwFc5tU JAiBmyXAGV8pTZCtJmJQvJvUxJCmHs3OMePs2dgWRZSzR+ieQ+jMe3JsPUVPv2O5fQqv wj0kAJIDaaqXSIVvRuna5epH4D1/tB4dmAic/KEFpdCOM88JcMIoZwGXPpqyh9+OXPDc ql7Q== X-Gm-Message-State: ACgBeo2Vt0re2jmuiZdKGkx9l8qGXdqFCSJSy3OaYXRsmqUsSmfU+hEP iIg5wcrYDzxA0qgKatmfmX5im7E= X-Google-Smtp-Source: AA6agR6EuvMwcPFuFlavgsX74oFaHl6/mgTnhPkeK37dno4GZPGuS2fbQUSbXTIX43lpJLYWWewLHsY= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a17:90b:10a:b0:200:2849:235f with SMTP id p10-20020a17090b010a00b002002849235fmr223959pjz.1.1662841018240; Sat, 10 Sep 2022 13:16:58 -0700 (PDT) Date: Sat, 10 Sep 2022 13:16:56 -0700 In-Reply-To: Mime-Version: 1.0 References: <0000000000005ed86405e846585a@google.com> Message-ID: Subject: Re: [PATCH] bpf: add missing percpu_counter_destroy() in htab_map_alloc() From: sdf@google.com To: Tetsuo Handa Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Kumar Kartikeya Dwivedi , syzbot , syzkaller-bugs@googlegroups.com, bpf@vger.kernel.org, netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On 09/11, Tetsuo Handa wrote: > syzbot is reporting ODEBUG bug in htab_map_alloc() [1], for > commit 86fe28f7692d96d2 ("bpf: Optimize element count in non-preallocated > hash map.") added percpu_counter_init() to htab_map_alloc() but forgot to > add percpu_counter_destroy() to the error path. > Link: https://syzkaller.appspot.com/bug?extid=5d1da78b375c3b5e6c2b [1] > Reported-by: syzbot > > Signed-off-by: Tetsuo Handa Thanks! Reviewed-by: Stanislav Fomichev > Fixes: 86fe28f7692d96d2 ("bpf: Optimize element count in non-preallocated > hash map.") > --- > kernel/bpf/hashtab.c | 2 ++ > 1 file changed, 2 insertions(+) > diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c > index 0fe3f136cbbe..86aec20c22d0 100644 > --- a/kernel/bpf/hashtab.c > +++ b/kernel/bpf/hashtab.c > @@ -622,6 +622,8 @@ static struct bpf_map *htab_map_alloc(union bpf_attr > *attr) > free_prealloc: > prealloc_destroy(htab); > free_map_locked: > + if (htab->use_percpu_counter) > + percpu_counter_destroy(&htab->pcount); > for (i = 0; i < HASHTAB_MAP_LOCK_COUNT; i++) > free_percpu(htab->map_locked[i]); > bpf_map_area_free(htab->buckets); > -- > 2.18.4