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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 488FFC3A5A3 for ; Tue, 27 Aug 2019 08:00:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D338233FF for ; Tue, 27 Aug 2019 08:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892815; bh=HEpVpW11R6XtlhWzOO8ZB/UtKNUSDr6cgG+ECkGdp48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jIw5xuFHgfjQzm1zMyk1RbhqLG5WLJuFOkuUQMFVV/pI9mgnD7BT+4J57AYETsX/V nid9COWI24SIINg5MPtcBDeZgxWfGa77UWEltfxuYTwj8Hez9ypjsufl6geISnYjKv TPdkq+1NQQ+a9ZXz/hPYHjTnsdMykf8vcMOHc8dY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731419AbfH0IAO (ORCPT ); Tue, 27 Aug 2019 04:00:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:54724 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730766AbfH0IAK (ORCPT ); Tue, 27 Aug 2019 04:00:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1E75721881; Tue, 27 Aug 2019 08:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892809; bh=HEpVpW11R6XtlhWzOO8ZB/UtKNUSDr6cgG+ECkGdp48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=peA28AS51ozGtVOPFPHLkZlcYTvJf7d0KydPrm9KLL+mZjys6WD7KyrXvVC1edc7m Q0JzY4R2syFI/JDTldheFMAe4bFGMTfiakIQimMKMPqSMwxUTD2KHknwy3gSsLDOjz bIlzwGWi94nhGrsIcFczkJ1/mHt02ZB7hUhybTAE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Fastabend , Daniel Borkmann , Sasha Levin Subject: [PATCH 5.2 022/162] bpf: sockmap, synchronize_rcu before freeing map Date: Tue, 27 Aug 2019 09:49:10 +0200 Message-Id: <20190827072739.088740557@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827072738.093683223@linuxfoundation.org> References: <20190827072738.093683223@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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