Received: by 10.192.165.148 with SMTP id m20csp4955180imm; Tue, 1 May 2018 06:50:19 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpoYkYjZMOrHtpzmIvdIK3dmsK51uPPSuzHHrJA4vDmWEcx4uAyIeAApyq/ACj97pflXvu7 X-Received: by 2002:a17:902:758a:: with SMTP id j10-v6mr16305153pll.11.1525182619652; Tue, 01 May 2018 06:50:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525182619; cv=none; d=google.com; s=arc-20160816; b=mry6nhyMFaP9bAxY5XLAaCIheIqd/Xe/1tcNjWMtoisrgiJLvUG8Av3p1tzFqmgEXD IizgaNHXAOzkD+eIdj5w9rlcuSLOoZmZnCllxLzmysJ9q83BqyURbPBMfGcuPMpuX/6B wRyH0lzdsJocKs0gUzsBUW2OPm/+h1pioj4um87sfMJIA938m2K0LrSLvSd58At/YU0j vJWUHb81tnU0ytvzlLElgAWT67e5dQAWzEINI3GWa3nQYwavJQmljjgWdhmOUwIwoSvU TVhthvkVfuIU3DuIqtPncntQb5IGPqQJhxAkj/Fbwk677r/XD3Zc5Ih7mcZ2zxcbBDW9 zwbw== 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=CVPFKLNI4eJPs1Ftf4EskkJ0GCtwuf5Ly9Pp6YvNamw=; b=WJ7aCV8g0ZI/ue4y5bafuzePzkIaNpJk9QeN5rm+OEj0Pqn5/mSA6IckbzpXSVxW8l dCi3sQ7ID3xUlI7xG6HsIelOBhcGM5MenAcVMEKyCQQTAvhSfVhjlRVAOoElgBdvMoy+ cHr0JZYrHZclSfuW3sAC4Oy7qVAM7ZS3nPCurg0rkdE45oc2GSsDo+yKcoBKlM7h9Vu0 1f4VA2zFA5uD812XLOHP/ELYLC9PQyGMLdHAi2mxq3YYVL1Tn0QNKEo4sV0t1gr6cC7V kOuBi17Y0bDhDlEu+zgN4kD9y4QiCRfzrJGYwtowpXCRrre/3YJDxpyyKYADxLihSnqb fHJA== 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 b3-v6si7754016pgc.479.2018.05.01.06.50.05; Tue, 01 May 2018 06:50:19 -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 S1755922AbeEANte (ORCPT + 99 others); Tue, 1 May 2018 09:49:34 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:41364 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755632AbeEANsv (ORCPT ); Tue, 1 May 2018 09:48:51 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w41Dl2f8095080 for ; Tue, 1 May 2018 09:48:50 -0400 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 2hprf52frf-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 01 May 2018 09:48:50 -0400 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 1 May 2018 14:48:47 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 1 May 2018 14:48:43 +0100 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w41DmhUw2425192; Tue, 1 May 2018 13:48:43 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 929A142041; Tue, 1 May 2018 14:39:56 +0100 (BST) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D3E6C4203F; Tue, 1 May 2018 14:39:54 +0100 (BST) Received: from localhost.ibm.com (unknown [9.80.105.194]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 1 May 2018 14:39:54 +0100 (BST) From: Mimi Zohar To: linux-integrity@vger.kernel.org Cc: Hans de Goede , Ard Biesheuvel , Peter Jones , Mimi Zohar , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells , "Luis R . Rodriguez" , "Luis R . Rodriguez" , Kees Cook , Seth Forshee , Johannes Berg Subject: [PATCH 4/6] ima: coordinate with signed regulatory.db Date: Tue, 1 May 2018 09:48:21 -0400 X-Mailer: git-send-email 2.7.5 In-Reply-To: <1525182503-13849-1-git-send-email-zohar@linux.vnet.ibm.com> References: <1525182503-13849-1-git-send-email-zohar@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18050113-0040-0000-0000-00000434CDA1 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18050113-0041-0000-0000-00002638E68A Message-Id: <1525182503-13849-5-git-send-email-zohar@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-05-01_07:,, 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-1805010138 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Based on IMA policy, measure and appraise regulatory.db firmware as usual, but on signature verification failure rely on regdb signature. For systems wanting IMA-appraisal enforcement on all firmware, including regdb, do not enable CONFIG_CFG80211_REQUIRE_SIGNED_REGDB. Signed-off-by: Mimi Zohar Cc: Luis R. Rodriguez Cc: David Howells Cc: Kees Cook Cc: Seth Forshee Cc: Johannes Berg --- security/integrity/ima/ima_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 8759280dccf6..71b5a51c6709 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -468,6 +468,7 @@ int ima_read_file(struct file *file, enum kernel_read_file_id read_id) static int read_idmap[READING_MAX_ID] = { [READING_FIRMWARE] = FIRMWARE_CHECK, + [READING_FIRMWARE_REGULATORY_DB] = FIRMWARE_CHECK, [READING_MODULE] = MODULE_CHECK, [READING_KEXEC_IMAGE] = KEXEC_KERNEL_CHECK, [READING_KEXEC_INITRAMFS] = KEXEC_INITRAMFS_CHECK, @@ -515,8 +516,12 @@ int ima_post_read_file(struct file *file, void *buf, loff_t size, func = read_idmap[read_id] ?: FILE_CHECK; security_task_getsecid(current, &secid); - return process_measurement(file, current_cred(), secid, buf, size, - MAY_READ, func, 0); + ret = process_measurement(file, current_cred(), secid, buf, size, + MAY_READ, func, 0); + + /* Co-ordination with signed regdb */ + if (ret < -EACCES && read_id == READING_FIRMWARE_REGULATORY_DB) + return 0; } static int __init init_ima(void) -- 2.7.5