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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 08067C32750 for ; Wed, 14 Aug 2019 02:39:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2DD12084F for ; Wed, 14 Aug 2019 02:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565750353; bh=9zDbpXrPwc3N3ew0Hf5XdLobrVPXyTxAnXCNgfMII4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LO7pEivkxz9bpPZ20byjzLbIbrzspRZHxGEP2ST5PWj35CDSsrJjpQnNZHTDIJBz8 edc4BshnF/s7efzeDy8CRPnpiJb7p2eFVK/mADuVZ5BklG2sxtGqUN88DI5I3ucX48 PD4K4cwlpqxk8RH2vus+xZ3elzIvnmus+TJ1nrr0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727569AbfHNCLh (ORCPT ); Tue, 13 Aug 2019 22:11:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:43838 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727535AbfHNCLg (ORCPT ); Tue, 13 Aug 2019 22:11:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 04064216F4; Wed, 14 Aug 2019 02:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565748695; bh=9zDbpXrPwc3N3ew0Hf5XdLobrVPXyTxAnXCNgfMII4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gnlpni8M+xCyxdPovOFiGTFx4BZBfMWbgXwea3h+ztWqlryhS0wysdybhzitm2TB7 gy2dcBCU0fBnFi5v0LhV4gv/jl1/ylA1fLgoQzK96BFifkctv5Ni6ddsw03fNNOZ2L BD2TyaJjwiZ7mqhOFZP7EVitU5Uc3sscujm3o4BM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Fastabend , Daniel Borkmann , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 026/123] bpf: sockmap, synchronize_rcu before free'ing map Date: Tue, 13 Aug 2019 22:09:10 -0400 Message-Id: <20190814021047.14828-26-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021047.14828-1-sashal@kernel.org> References: <20190814021047.14828-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: John Fastabend [ Upstream commit 2bb90e5cc90e1d09f631aeab041a9cf913a5bbe5 ] 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 Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- 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 1d40e040320d2..bbc91597d8364 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -252,6 +252,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.20.1