From patchwork Thu Mar 9 17:29:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tycho Andersen X-Patchwork-Id: 9613739 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2FDE660417 for ; Thu, 9 Mar 2017 17:31:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21A4D27F99 for ; Thu, 9 Mar 2017 17:31:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14F67286BE; Thu, 9 Mar 2017 17:31:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DE0027F99 for ; Thu, 9 Mar 2017 17:31:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754853AbdCIRbr (ORCPT ); Thu, 9 Mar 2017 12:31:47 -0500 Received: from mail-pf0-f180.google.com ([209.85.192.180]:35950 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754526AbdCIRbq (ORCPT ); Thu, 9 Mar 2017 12:31:46 -0500 Received: by mail-pf0-f180.google.com with SMTP id o126so31201794pfb.3 for ; Thu, 09 Mar 2017 09:30:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=docker.com; s=google; h=from:to:cc:subject:date:message-id; bh=9werAetMQniXWGLiYHo63FUVDdaSl63mIovTHvqudBc=; b=FWMb/viCwHg0pdlP1cn3KGROk77Gp+FWpl1d5wKGye3mp5FLoi6qwK3HYCX3bvwRum fujR6pvw5gOK3L8kOD88ymqW35O0vOkCO3D/PhPfF5L1fpnJ7byfUlLvIvjoIUNKX9xK G2aPu4yIBmC62xAlogquIxD3xG1kV1moh2hhE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9werAetMQniXWGLiYHo63FUVDdaSl63mIovTHvqudBc=; b=EgsOMR62Y2l0Yzd/c4CHnenKb+B59jJn8a4aHAV9qRy41Qb8ljSbMJS/ibRaEPD+55 IHRX1I0GaC/tbfL5qMywnfb/dBcgYM4r0ECASUCkSXTi7ElDbcFCiXrWlQcry4LBL3rB Uh7o4aL1tvWL7vN/U2iudtssfkAh3OGImsPhBAvDICQ/ygLlqmq27qPYscs9rnQfnGPC oJtNbSwsP17U/mmdxZGGDf/tgMu5AIHng3yyrZ+DFDz/gFPoP+g91R30sD3qCqiW3ch8 EOmXU1qV4BnTol5kLkrNetLg2F2E2IP/AD5MpkBgLcwzRZzPgKidm9p4RH1uzLksT+b7 hEtg== X-Gm-Message-State: AMke39lTyXcVozRVhfhLQERsK0pOcfJeYSQAsNMySWndVTqGx9spkhTioCanfiB86WLwKqGL X-Received: by 10.99.199.69 with SMTP id v5mr15016882pgg.90.1489080600315; Thu, 09 Mar 2017 09:30:00 -0800 (PST) Received: from docker-Precision-5510.docker.com (50-233-46-102-static.hfc.comcastbusiness.net. [50.233.46.102]) by smtp.gmail.com with ESMTPSA id t12sm13702925pfg.14.2017.03.09.09.29.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Mar 2017 09:29:59 -0800 (PST) From: Tycho Andersen To: Kees Cook , James Morris Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Tycho Andersen , "Serge E. Hallyn" Subject: [PATCH] security/Kconfig: further restrict HARDENED_USERCOPY Date: Thu, 9 Mar 2017 09:29:21 -0800 Message-Id: <1489080561-30786-1-git-send-email-tycho@docker.com> X-Mailer: git-send-email 2.7.4 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP It doesn't make sense to have HARDENED_USERCOPY when either /dev/kmem is enabled or /dev/mem can be used to read kernel memory. v2: add !MMU depend as well Signed-off-by: Tycho Andersen CC: Kees Cook CC: "Serge E. Hallyn" CC: James Morris --- security/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/security/Kconfig b/security/Kconfig index 3ff1bf9..aeabd40 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -142,6 +142,8 @@ config HARDENED_USERCOPY bool "Harden memory copies between kernel and userspace" depends on HAVE_ARCH_HARDENED_USERCOPY depends on HAVE_HARDENED_USERCOPY_ALLOCATOR + depends on !DEVKMEM + depends on !ARCH_HAS_DEVMEM_IS_ALLOWED || STRICT_DEVMEM || !MMU select BUG help This option checks for obviously wrong memory regions when