Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp3660983imm; Tue, 29 May 2018 11:05:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr8IwQqaAvCvyqTVEnfW9grqjlmHva9Vq1DsRVMF0jZ9UghVM1o/pwrUg1gXxubePwS/bhc X-Received: by 2002:a65:44c3:: with SMTP id g3-v6mr14629884pgs.428.1527617105732; Tue, 29 May 2018 11:05:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527617105; cv=none; d=google.com; s=arc-20160816; b=qGeN4Y3qCl12W0AG3BgDpZnCXatgLL2uXn3eZe2GKp8Gl8moW2mY8qkCw5yn7R1uhT UPv4M7e/hZ0x+o/z6Ca0oiAYolk58PlpU+aGsOg6FB+IrY3kGf4+Nd5jpvG+rX575SVp b4gnADcYgWv9lAYbMLwI/4brHyAcWc8xBOPzBmjZiWHa0ME/2+IJmEg0+qM/e7fbdTiG pDqIind4vb2OSVse0va8ubLUwZ/gHKD+lvKB3/uanKXoA0XndUIjLXA7dcqqv3zSP5j0 xtsIdUyvRXg/3AvEV2nGTn5mlDqBx0g4ETNn8BIuCWSZVqhdNBoCA+n7251H4/Frr07x 4J8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from:arc-authentication-results; bh=JZyAn3yoX0P0/kjv3MxvZPaTRctVVE4i6VrGy6x87ok=; b=JiFgXlnytjEmb6oIqdCQ1sw4qILg5nJVO95BAQkpjJU37g8dpK+No4TV6BZ2uldg5u V7g37znmpfQF5PKiEfd3zprjHa9ICXGCZXi+SnZAVmfh9B3SoQWaTkOQcPkl6/4WIPYJ pOBbUO9P6fLkU+Ya5Vp8Ak3rFsOplUKxfQ13JZrjHPS2+vGMHJksHPsATrO5sipm/xVf m4ynv1N2P1xep8blwP/QhILI8F1G5OARv7+kmsXyAdWZUxyZCACRMHJwDgSSdlVo9w69 cAH895r2ZqbNG24O3/M/y3P1AFzryH59g5DHIKjN0yJHx2RHoRWBoFs/Fi5KHNYmJsW7 7KlA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g12-v6si34035602pfi.212.2018.05.29.11.04.51; Tue, 29 May 2018 11:05:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965972AbeE2SDy (ORCPT + 99 others); Tue, 29 May 2018 14:03:54 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:52934 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965780AbeE2SC1 (ORCPT ); Tue, 29 May 2018 14:02:27 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w4THsYVS072088 for ; Tue, 29 May 2018 14:02:26 -0400 Received: from e06smtp14.uk.ibm.com (e06smtp14.uk.ibm.com [195.75.94.110]) by mx0a-001b2d01.pphosted.com with ESMTP id 2j9955yxwb-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 29 May 2018 14:02:25 -0400 Received: from localhost by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 29 May 2018 19:02:22 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 29 May 2018 19:02:18 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w4TI2Ihh11796524 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 29 May 2018 18:02:18 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9A61BAE053; Tue, 29 May 2018 18:51:24 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 51F31AE055; Tue, 29 May 2018 18:51:23 +0100 (BST) Received: from dhcp-9-2-54-219.watson.ibm.com (unknown [9.2.54.219]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 29 May 2018 18:51:23 +0100 (BST) From: Mimi Zohar To: linux-integrity@vger.kernel.org Cc: Mimi Zohar , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells , "Luis R . Rodriguez" , Eric Biederman , kexec@lists.infradead.org, Andres Rodriguez , Greg Kroah-Hartman , Ard Biesheuvel , "Luis R . Rodriguez" , Kees Cook Subject: [PATCH v4 4/8] firmware: add call to LSM hook before firmware sysfs fallback Date: Tue, 29 May 2018 14:01:56 -0400 X-Mailer: git-send-email 2.7.5 In-Reply-To: <1527616920-5415-1-git-send-email-zohar@linux.vnet.ibm.com> References: <1527616920-5415-1-git-send-email-zohar@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18052918-0044-0000-0000-00000558109D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18052918-0045-0000-0000-0000289A201C Message-Id: <1527616920-5415-5-git-send-email-zohar@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-05-29_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=5 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1805290195 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add an LSM hook prior to allowing firmware sysfs fallback loading. Signed-off-by: Mimi Zohar Cc: Luis R. Rodriguez Cc: David Howells Cc: Kees Cook Changelog v4: - call new LSM security_kernel_arg hook Changelog v2: - call security_kernel_read_blob() - rename the READING_FIRMWARE_FALLBACK kernel_read_file_id enumeration to READING_FIRMWARE_FALLBACK_SYSFS. --- drivers/base/firmware_loader/fallback.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c index 358354148dec..2443bda81631 100644 --- a/drivers/base/firmware_loader/fallback.c +++ b/drivers/base/firmware_loader/fallback.c @@ -651,6 +651,8 @@ static bool fw_force_sysfs_fallback(unsigned int opt_flags) static bool fw_run_sysfs_fallback(unsigned int opt_flags) { + int ret; + if (fw_fallback_config.ignore_sysfs_fallback) { pr_info_once("Ignoring firmware sysfs fallback due to sysctl knob\n"); return false; @@ -659,6 +661,11 @@ static bool fw_run_sysfs_fallback(unsigned int opt_flags) if ((opt_flags & FW_OPT_NOFALLBACK)) return false; + /* Also permit LSMs and IMA to fail firmware sysfs fallback */ + ret = security_kernel_load_data(LOADING_FIRMWARE); + if (ret < 0) + return ret; + return fw_force_sysfs_fallback(opt_flags); } -- 2.7.5