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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 24D51C3B18B for ; Thu, 13 Feb 2020 15:46:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2FEF20675 for ; Thu, 13 Feb 2020 15:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581608782; bh=AzMvOGFeP02uYb2htvlWBAJwij+2RSgKQh/WezhmmP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G7jLwyQQVcHuc/O21m5nRoSsgRzetxN2nfdzp3g+/A6ApeVwDuwBNFNQ1uc5/UnCB J06jwnBdiXIDmUH02hHptJ5T1K6nStSbYEQfAtf6xC5c8ZlcSOWZsV8hRTineMMQRF n4fVnfDAfL1yU5n35TJwQXNdatSlaUCyHW/T82Xg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728589AbgBMPqV (ORCPT ); Thu, 13 Feb 2020 10:46:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:49726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729354AbgBMP1S (ORCPT ); Thu, 13 Feb 2020 10:27:18 -0500 Received: from localhost (unknown [104.132.1.104]) (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 B7C1720661; Thu, 13 Feb 2020 15:27:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607636; bh=AzMvOGFeP02uYb2htvlWBAJwij+2RSgKQh/WezhmmP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1lJ5gmJmRyI0zh+XeYpOAG+hvPTLuI0o987osSdu1EbTspbLxowOI0xDb3BOn5TSY AeS3v7H3aoIvdlbTpLc4clpOvmaGgFeCMJlLlGBrdMv3SLA7GYNvSkWyfqwLOJDihx KSuIR8v7Te7v7SZ6aEmeP62tQrO0gBtgRoF2qcRY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Sitnicki , Daniel Borkmann , John Fastabend Subject: [PATCH 5.4 23/96] bpf, sockhash: Synchronize_rcu before freeing map Date: Thu, 13 Feb 2020 07:20:30 -0800 Message-Id: <20200213151848.153137952@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151839.156309910@linuxfoundation.org> References: <20200213151839.156309910@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jakub Sitnicki commit 0b2dc83906cf1e694e48003eae5df8fa63f76fd9 upstream. We need to have a synchronize_rcu before free'ing the sockhash because any outstanding psock references will have a pointer to the map and when they use it, this could trigger a use after free. This is a sister fix for sockhash, following commit 2bb90e5cc90e ("bpf: sockmap, synchronize_rcu before free'ing map") which addressed sockmap, which comes from a manual audit. Fixes: 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface") Signed-off-by: Jakub Sitnicki Signed-off-by: Daniel Borkmann Acked-by: John Fastabend Link: https://lore.kernel.org/bpf/20200206111652.694507-3-jakub@cloudflare.com Signed-off-by: Greg Kroah-Hartman --- net/core/sock_map.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -250,6 +250,7 @@ static void sock_map_free(struct bpf_map } raw_spin_unlock_bh(&stab->lock); + /* wait for psock readers accessing its map link */ synchronize_rcu(); bpf_map_area_free(stab->sks); @@ -873,6 +874,9 @@ static void sock_hash_free(struct bpf_ma raw_spin_unlock_bh(&bucket->lock); } + /* wait for psock readers accessing its map link */ + synchronize_rcu(); + bpf_map_area_free(htab->buckets); kfree(htab); }