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=-16.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 4D2B7C43381 for ; Wed, 27 Mar 2019 15:21:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1536F2082F for ; Wed, 27 Mar 2019 15:21:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QrBLqkdT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728059AbfC0PVj (ORCPT ); Wed, 27 Mar 2019 11:21:39 -0400 Received: from mail-vk1-f201.google.com ([209.85.221.201]:53246 "EHLO mail-vk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726054AbfC0PVi (ORCPT ); Wed, 27 Mar 2019 11:21:38 -0400 Received: by mail-vk1-f201.google.com with SMTP id 81so6464922vkn.19 for ; Wed, 27 Mar 2019 08:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=ogtCC0fkXsk9uOHNWfukF59orwrGTpRkkwb+W3Ru3lY=; b=QrBLqkdTCLX0koYuPaRJHQjZVSCbsOZUtZoZ0V7nfp95F2XyWhuFLyCcxHTw+EMtAs wweiTUJTy3QAyIr2oK9i0b69hd5L+uDuSj396Y/jJu9aXWcBDdEI6MO9adWjijAPgRmV QeqpJrdbqamSYgaDk0PGGJn6UP+0bHFvxlTUkagBAkSWU8SNrZtioQnOhOArU1U5hwk4 diQxl/OyrnVOZjzfKPpJeh4kKhrOE7oUTsBPcrDcyZRuMoEo3Kxg6FxTmkd9dqeinKQT x3akqgUTtyHG0VthbbO6Z+3jYz8qa4ee2hycHbA3PXaTew2A4XrNJd1McAfqFLNaYEBT u5lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ogtCC0fkXsk9uOHNWfukF59orwrGTpRkkwb+W3Ru3lY=; b=F51MyNvGBgEiRhGbe7WsqzeETXu1k6SMYsReDDPOmSf5TQD0NBXv/w+GxSIrKn9SCe Z9aI9JwqNV3glaS7fYtMXAxTIOhFddWyePKaUD0hpH+2By3NU/2vz9wNy5UFDDAq8qxs Q+5FnAMocU6hwO/TBOMxQFIQ3r9JJhyyWF3ivq323RvGIs53RzIIfQlHH+2Wm71+9jf0 j39ZD3ygf0DSzBSk8ldTOLolagM7Bn+nrK0ACLq15TUThxK7kKjJ6DxSM6tAyQVY3K7U 5TrorGGd94mP/8iVVsIV90Yxkd45UrwMCN5WEFt4R6kKLqEEbMX09Gt2Pp5u40MaAeZW xDjQ== X-Gm-Message-State: APjAAAWeFL+iv6LRbD2Ph4hRSPvLAvjxTwuRwFo3IYH57wHXxxbN+Uno p493fQnjAoFcAvcrRRVo/EFrdzsyCE8v5Q== X-Google-Smtp-Source: APXvYqw1iB25EOrfhedmCNfPUe33t3my7xBRCuQsc+Ur4TcGQg+pwGxPbk6DQ1i2TELkmhspHmqrrATEDJOKjg== X-Received: by 2002:a1f:a50f:: with SMTP id o15mr591711vke.1.1553700097677; Wed, 27 Mar 2019 08:21:37 -0700 (PDT) Date: Wed, 27 Mar 2019 08:21:30 -0700 Message-Id: <20190327152130.62042-1-edumazet@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH net] netns: provide pure entropy for net_hash_mix() From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet , Amit Klein , Benny Pinkas , Pavel Emelyanov Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org net_hash_mix() currently uses kernel address of a struct net, and is used in many places that could be used to reveal this address to a patient attacker, thus defeating KASLR, for the typical case (initial net namespace, &init_net is not dynamically allocated) I believe the original implementation tried to avoid spending too many cycles in this function, but security comes first. Also provide entropy regardless of CONFIG_NET_NS. Fixes: 0b4419162aa6 ("netns: introduce the net_hash_mix "salt" for hashes") Signed-off-by: Eric Dumazet Reported-by: Amit Klein Reported-by: Benny Pinkas Cc: Pavel Emelyanov --- include/net/net_namespace.h | 1 + include/net/netns/hash.h | 10 ++-------- net/core/net_namespace.c | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index a68ced28d8f47e09c6f6beabc56a22a04ae3f163..12689ddfc24c44fe3297d1eda548811d8061670b 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -59,6 +59,7 @@ struct net { */ spinlock_t rules_mod_lock; + u32 hash_mix; atomic64_t cookie_gen; struct list_head list; /* list of network namespaces */ diff --git a/include/net/netns/hash.h b/include/net/netns/hash.h index 16a842456189f2fc1a3363685b5dd4310a32b2b8..d9b665151f3d9e916f35620141542a5a145e6123 100644 --- a/include/net/netns/hash.h +++ b/include/net/netns/hash.h @@ -2,16 +2,10 @@ #ifndef __NET_NS_HASH_H__ #define __NET_NS_HASH_H__ -#include - -struct net; +#include static inline u32 net_hash_mix(const struct net *net) { -#ifdef CONFIG_NET_NS - return (u32)(((unsigned long)net) >> ilog2(sizeof(*net))); -#else - return 0; -#endif + return net->hash_mix; } #endif diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 17f36317363d19dcdeb6a6e75a116220b078c2b0..7e6dcc6257011d8b60e132e97a0db229c39d1daf 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -304,6 +304,7 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns) refcount_set(&net->count, 1); refcount_set(&net->passive, 1); + get_random_bytes(&net->hash_mix, sizeof(u32)); net->dev_base_seq = 1; net->user_ns = user_ns; idr_init(&net->netns_ids); -- 2.21.0.392.gf8f6787159e-goog