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=-11.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 7D85CC43603 for ; Wed, 18 Dec 2019 00:47:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BCC02176D for ; Wed, 18 Dec 2019 00:47:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="GnxDuaZh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725975AbfLRArL (ORCPT ); Tue, 17 Dec 2019 19:47:11 -0500 Received: from mail-pj1-f68.google.com ([209.85.216.68]:40070 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725940AbfLRArL (ORCPT ); Tue, 17 Dec 2019 19:47:11 -0500 Received: by mail-pj1-f68.google.com with SMTP id n67so38157pjb.5 for ; Tue, 17 Dec 2019 16:47:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=JOD0hctImSCyHhKVi4ohdZns50E8enk2Ku8VcR+X1mI=; b=GnxDuaZhvErR9LcNMj3PKDfaj4LWKrDIHqWoyCWVhSpAEOaEcD6nOHLmQTkuHudiSj bgWwmjeu/iM2adBj97MNz5CTfRg0n26l72Pu7extoYavi7VnZQTJ3B3QDihqFNFmpA9v 5TIxw3gotUFbmyHWdVahtV7qWfhrDmoVR8FME= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=JOD0hctImSCyHhKVi4ohdZns50E8enk2Ku8VcR+X1mI=; b=D0u2buz75iBKEEOh/EqoCn9kvnZzuhmwATvHMmZ0YCMCVod9Sb+lhSfjESkfUNWSIU dEpVWmNW8Njrfj2acsi3heIPWAtWJvXzasp3gmSkF0C1Kz7gr8eMuqRs7aaYALxxf7BQ Qz5i6uvuXcSTjcUIV3mZfewucCsXlrCXfeuDH+7HMcM4pvJtgOjIQedyenFWHZzQ6x9p C9s+5iLfTRsJKK4BVEo6Ta2Z5ATleAP+4Q4DGFXNg9hY4/acGXubTHWCcOoaxFlFfZgx F1zOyI3kGJNBlhG1dCA8NKKIiUyQYJuayGX7rKjYKrjrXx6oDI5BgoSoj71OQSy7Ylsu IXGg== X-Gm-Message-State: APjAAAWRfPZdDEgba4j4TW5QEJcqDUCjHqtyiosfUPlk7radNpFKr4hA 7QF6zIgSSamNo+vk1ZcZVVU+Zw== X-Google-Smtp-Source: APXvYqyDzfVo4vptAtBTgPw00ql83S4izR6YpmnUq9SrK3yUCrvh/NJX9rQyCnccEtWsiIHfh7yrDQ== X-Received: by 2002:a17:90a:fe02:: with SMTP id ck2mr236214pjb.10.1576630030894; Tue, 17 Dec 2019 16:47:10 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id o6sm212121pgg.37.2019.12.17.16.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2019 16:47:10 -0800 (PST) Date: Tue, 17 Dec 2019 16:47:09 -0800 From: Kees Cook To: Wenhui Zhang Cc: Stephen Smalley , Paul Moore , SELinux , Ondrej Mosnacek , Jeffrey Vander Stoep Subject: Re: [RFC PATCH] selinux: randomize layout of key structures Message-ID: <201912171645.663C28F0@keescook> References: <20191213202838.7323-1-sds@tycho.nsa.gov> <201912171550.C731CA1C@keescook> <201912171616.616C9C9990@keescook> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org On Tue, Dec 17, 2019 at 07:21:49PM -0500, Wenhui Zhang wrote: > In my understanding, evm is called whenever a security related attribute is > committed to VFS. > It is set as enabled by default. > (ref. > https://github.com/torvalds/linux/blob/8b68150883ca466a23e90902dd4113b22e692f04/security/integrity/evm/evm_main.c > ) Okay, so yes, complimentary. randstruct means attackers need use bugs to expose enough memory from the kernel to determine the order of structure members before they can manipulate them with a kernel bug. -Kees > > On Tue, Dec 17, 2019 at 7:16 PM Kees Cook wrote: > > > On Tue, Dec 17, 2019 at 07:12:28PM -0500, Wenhui Zhang wrote: > > > Hi, Sorry for bothering you again. > > > > > > However I came into some *evm code* in LSM, which calculates HMAC for > > data > > > structures. > > > It looks like HMAC could protect integrity of LSM data structures. > > > > > > IMHO, __randomize_layout and evm might duplicate the work, any > > instructions > > > on this please? > > > > When does the EVM code perform the checking? I would assume these are > > complimentary features rather than duplicate. > > > > -Kees > > > > > > > > > > > On Tue, Dec 17, 2019 at 6:50 PM Kees Cook wrote: > > > > > > > On Fri, Dec 13, 2019 at 03:28:38PM -0500, Stephen Smalley wrote: > > > > > Randomize the layout of key selinux data structures. > > > > > Initially this is applied to the selinux_state, selinux_ss, > > > > > policydb, and task_security_struct data structures. > > > > > > > > > > NB To test/use this mechanism, one must install the > > > > > necessary build-time dependencies, e.g. gcc-plugin-devel on Fedora, > > > > > and enable CONFIG_GCC_PLUGIN_RANDSTRUCT in the kernel configuration. > > > > > > > > > > Signed-off-by: Stephen Smalley > > > > > > > > Reviewed-by: Kees Cook > > > > > > > > -Kees > > > > > > > > > --- > > > > > I would have expected that two kernels built with the same config > > > > > with this enabled would have yielded different struct layouts in > > > > > pahole vmlinux output, but that doesn't appear to be the case. They > > > > > do have different seeds. Am I doing something wrong? > > > > > Also, does DEBUG_INFO_BTF effectively undermine/negate the benefits > > of > > > > this > > > > > change if enabled? > > > > > > > > > > security/selinux/include/objsec.h | 2 +- > > > > > security/selinux/include/security.h | 2 +- > > > > > security/selinux/ss/policydb.h | 2 +- > > > > > security/selinux/ss/services.h | 2 +- > > > > > 4 files changed, 4 insertions(+), 4 deletions(-) > > > > > > > > > > diff --git a/security/selinux/include/objsec.h > > > > b/security/selinux/include/objsec.h > > > > > index a4a86cbcfb0a..330b7b6d44e0 100644 > > > > > --- a/security/selinux/include/objsec.h > > > > > +++ b/security/selinux/include/objsec.h > > > > > @@ -35,7 +35,7 @@ struct task_security_struct { > > > > > u32 create_sid; /* fscreate SID */ > > > > > u32 keycreate_sid; /* keycreate SID */ > > > > > u32 sockcreate_sid; /* fscreate SID */ > > > > > -}; > > > > > +} __randomize_layout; > > > > > > > > > > enum label_initialized { > > > > > LABEL_INVALID, /* invalid or not initialized */ > > > > > diff --git a/security/selinux/include/security.h > > > > b/security/selinux/include/security.h > > > > > index 49737087ad33..3ea406ad91b6 100644 > > > > > --- a/security/selinux/include/security.h > > > > > +++ b/security/selinux/include/security.h > > > > > @@ -110,7 +110,7 @@ struct selinux_state { > > > > > bool policycap[__POLICYDB_CAPABILITY_MAX]; > > > > > struct selinux_avc *avc; > > > > > struct selinux_ss *ss; > > > > > -}; > > > > > +} __randomize_layout; > > > > > > > > > > void selinux_ss_init(struct selinux_ss **ss); > > > > > void selinux_avc_init(struct selinux_avc **avc); > > > > > diff --git a/security/selinux/ss/policydb.h > > > > b/security/selinux/ss/policydb.h > > > > > index bc56b14e2216..98afe52a3d19 100644 > > > > > --- a/security/selinux/ss/policydb.h > > > > > +++ b/security/selinux/ss/policydb.h > > > > > @@ -307,7 +307,7 @@ struct policydb { > > > > > > > > > > u16 process_class; > > > > > u32 process_trans_perms; > > > > > -}; > > > > > +} __randomize_layout;; > > > > > > > > > > extern void policydb_destroy(struct policydb *p); > > > > > extern int policydb_load_isids(struct policydb *p, struct sidtab > > *s); > > > > > diff --git a/security/selinux/ss/services.h > > > > b/security/selinux/ss/services.h > > > > > index fc40640a9725..c5896f39e8f6 100644 > > > > > --- a/security/selinux/ss/services.h > > > > > +++ b/security/selinux/ss/services.h > > > > > @@ -31,7 +31,7 @@ struct selinux_ss { > > > > > struct selinux_map map; > > > > > struct page *status_page; > > > > > struct mutex status_lock; > > > > > -}; > > > > > +} __randomize_layout; > > > > > > > > > > void services_compute_xperms_drivers(struct extended_perms *xperms, > > > > > struct avtab_node *node); > > > > > -- > > > > > 2.23.0 > > > > > > > > > > > > > -- > > > > Kees Cook > > > > > > > > > > > > > -- > > > V/R, > > > > > > Wenhui Zhang > > > > > > Email: wenhui@gwmail.gwu.edu > > > Telephone: 1-(703) 424 3193 > > > > -- > > Kees Cook > > > > > -- > V/R, > > Wenhui Zhang > > Email: wenhui@gwmail.gwu.edu > Telephone: 1-(703) 424 3193 -- Kees Cook