Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp3375727imm; Thu, 17 May 2018 07:51:10 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrWV2JjdEP2PKfOlQizVk2TvfR5hH/EJmuLPjSOIHO+UiqKNGe7VFHAr4OpJidbVvPEl/IX X-Received: by 2002:a17:902:6b8b:: with SMTP id p11-v6mr5387425plk.212.1526568670627; Thu, 17 May 2018 07:51:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526568670; cv=none; d=google.com; s=arc-20160816; b=pnN6anKi5k+eaFm4J3P6GVreCTcmDSAP/doIA9j3sxuV43qgW5MN+nlB8kwicAQPIo z6kKNS0F7ey9nUsBgCo0KRFYGkTZwkFxb4psbtkE529n+Kqf/eoNX46IL4l9KQk7kjBT dDHF9K6mOkpAMu6oT2DaRTvv0UKYjNqYiOtZOSv1z6PrCpWgoRw2lZTgEW1zWjjh/jpb qW7DVFPMavId6TVus9cPFJEqqrSUSAKLLE2DsTCI7EAye58XgtQU8zNK3vcLOGqSSOUq HI3ZxtL7GX2/OSCx9vjbLg3h9YgOqkueJ3/4ePfloK1lBgIvJ4qOWve8LkX1twUoHbKg P9oA== 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=aq6mzsOlRGILVIxAVw+U3wD2O/wbIFkzikuJBt68bgM=; b=m3fyPPr7EJMn+5oABjK3Ir2zp2hkPEx40ISeQMO3lYWwdHM0uOiiMirZJHnYms+pDs Zdh44+NfFsdfZRBYmlkyPik/S0HAYp2QnqPAobe4NgtmG+bVTJJlzGz4Jj//Fpj6/0gT XwM5Exlfmp10Wiu29Q9yKmme+h3MHkaZJBybLKSPH4S3rU9nwTyZoWKBQdJBqvYf3j3g Q2LFpg1OMnKTdCVPaEfV0j9cfKkVJzC1zxiVdSH4GgqMtCnmp/ykOL2P3BNzpr6oI55u VaEPbRJL7yH/0tBNNSxNAG7i/hCbhwC8xYwRgbO5gcb4E+T4p6lms68yQcBxgkEKSrkl 36tg== 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 h8-v6si5305139pfi.115.2018.05.17.07.50.56; Thu, 17 May 2018 07:51:10 -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 S1752573AbeEQOt4 (ORCPT + 99 others); Thu, 17 May 2018 10:49:56 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:39958 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752556AbeEQOtv (ORCPT ); Thu, 17 May 2018 10:49:51 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w4HEiwg0119744 for ; Thu, 17 May 2018 10:49:50 -0400 Received: from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109]) by mx0a-001b2d01.pphosted.com with ESMTP id 2j1bmvrnw1-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 May 2018 10:49:50 -0400 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 17 May 2018 15:49:47 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 17 May 2018 15:49:44 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w4HEnhGj13435172; Thu, 17 May 2018 14:49:44 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 89C7C4C04A; Thu, 17 May 2018 15:41:32 +0100 (BST) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E73E64C044; Thu, 17 May 2018 15:41:30 +0100 (BST) Received: from localhost.ibm.com (unknown [9.80.108.64]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 17 May 2018 15:41:30 +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 v2 6/9] firmware: add call to LSM hook before firmware sysfs fallback Date: Thu, 17 May 2018 10:48:47 -0400 X-Mailer: git-send-email 2.7.5 In-Reply-To: <1526568530-9144-1-git-send-email-zohar@linux.vnet.ibm.com> References: <1526568530-9144-1-git-send-email-zohar@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18051714-0012-0000-0000-000005D7A704 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18051714-0013-0000-0000-00001954D35C Message-Id: <1526568530-9144-7-git-send-email-zohar@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-05-17_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 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-1805170137 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: - 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 +++++++ include/linux/fs.h | 1 + 2 files changed, 8 insertions(+) diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c index 358354148dec..6ec97e19c017 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_read_blob(READING_FIRMWARE_FALLBACK_SYSFS); + if (ret < 0) + return ret; + return fw_force_sysfs_fallback(opt_flags); } diff --git a/include/linux/fs.h b/include/linux/fs.h index 760d8da1b6c7..6e31d9207435 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2810,6 +2810,7 @@ extern int do_pipe_flags(int *, int); id(UNKNOWN, unknown) \ id(FIRMWARE, firmware) \ id(FIRMWARE_PREALLOC_BUFFER, firmware) \ + id(FIRMWARE_FALLBACK_SYSFS, firmware) \ id(MODULE, kernel-module) \ id(KEXEC_IMAGE, kexec-image) \ id(KEXEC_INITRAMFS, kexec-initramfs) \ -- 2.7.5