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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, 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 EAD02C76197 for ; Fri, 19 Jul 2019 17:31:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7E8D2186A for ; Fri, 19 Jul 2019 17:31:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="cCEhw1Nf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731458AbfGSRbM (ORCPT ); Fri, 19 Jul 2019 13:31:12 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:36356 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731435AbfGSRbL (ORCPT ); Fri, 19 Jul 2019 13:31:11 -0400 Received: by mail-qk1-f195.google.com with SMTP id g18so23798452qkl.3 for ; Fri, 19 Jul 2019 10:31:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/VfBYKXGqMN603JK/mOP746M3s/e0VEm3g6mJUQVwPg=; b=cCEhw1NfdSLPAkIExliXrXF1MaxRBVWKFBguxs2EyW8mkbFLGzfsPqiIOQSTRW9zUp p6ZqMNED7AnfuqGLyfaV6rM+bn4dVbZX/BqV6btqOEHFWp7eMfevRrGN+CLgFdjIn1ZU EcHyFTn3wZswOmsdlbycd8GxD5GlbgIhvftgi69p1TpOv+SBJngMuM1f/UKTS9+3iXj8 RHaLofgf3/bPPxdxK/YLL7ViQ5FFZ4lGVQy6hOalwQ/ex+iuhf1IIQSZqYw4hmybj4I9 VQvgJC+XNafRDeiaQpTqa5XlZe0dMw/JSSwpzqxSVI79Bna6sAWtH0MjuydAwFFs07Mh NpPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/VfBYKXGqMN603JK/mOP746M3s/e0VEm3g6mJUQVwPg=; b=tLFlZ6Pa2W/ISOeN1mfylLUjbPYjL/w84X9JqHNhWK59GqzLvbGPYy62E0xgZswtg/ PJM80uaJ+qh1bzIa5L6ZKpDrvV7OjJaRnQh3PULl++Beb1nKcex08MnmRtlQrh5AxFSr J/w3MgRvExBlrc3XNOTb9EvIf3W3L45rrRsP/H/TOIeYNuGWRdBBN4JIy8/n75ZeVeTY 9Xu6oI6+S2D6FkymoRmgh7GEaYCzmLF/6Biv58OViq219nNkc+AUY1Wj85n6EUoJuDF5 fVj8X82s8JJcy4wEqdTokP3uL3qnXdtKiEEueGAjZIuIrUf80dy1v5PamG5IVUl9aF/g nZoA== X-Gm-Message-State: APjAAAXQLl6H3fFPb/HUe/s92IuiuEehqE6JSOS2HOcym/08pitXrH4S pzbGy9UbDTxiUC1lsko9Fiy6Qwx1qNY= X-Google-Smtp-Source: APXvYqwOpDCkEuRPMUtRhYP7hvcEZYVKI21TlNIcPKPrM2GMACY7oRN1w2xZtybC9l0m+JRYvlBamQ== X-Received: by 2002:ae9:e202:: with SMTP id c2mr33533918qkc.15.1563557470634; Fri, 19 Jul 2019 10:31:10 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id y3sm15568509qtj.46.2019.07.19.10.31.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jul 2019 10:31:10 -0700 (PDT) From: Jakub Kicinski To: john.fastabend@gmail.com, alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: edumazet@google.com, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH bpf v4 07/14] bpf: sockmap, synchronize_rcu before free'ing map Date: Fri, 19 Jul 2019 10:29:20 -0700 Message-Id: <20190719172927.18181-8-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190719172927.18181-1-jakub.kicinski@netronome.com> References: <20190719172927.18181-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: John Fastabend We need to have a synchronize_rcu before free'ing the sockmap because any outstanding psock references will have a pointer to the map and when they use this could trigger a use after free. Fixes: 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface") Signed-off-by: John Fastabend --- net/core/sock_map.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/core/sock_map.c b/net/core/sock_map.c index 28702f2e9a4a..56bcabe7c2f2 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -247,6 +247,8 @@ static void sock_map_free(struct bpf_map *map) raw_spin_unlock_bh(&stab->lock); rcu_read_unlock(); + synchronize_rcu(); + bpf_map_area_free(stab->sks); kfree(stab); } -- 2.21.0