Received: by 10.192.165.148 with SMTP id m20csp4955658imm; Tue, 1 May 2018 06:50:51 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq9sOpVN1wljdykxZJpvWwi7aNoOexXWMCimpfIMROB+TgHabmMMSRm18ua4APCzDR+p/8Y X-Received: by 10.98.200.152 with SMTP id i24mr15879195pfk.35.1525182651555; Tue, 01 May 2018 06:50:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525182651; cv=none; d=google.com; s=arc-20160816; b=PjOVafmvkipCUQmpc7KbB2HZdr7M9kxuXFYJ7muRBSMRXnmsKcMPVUy4CHK3/7zVCJ WIJg4ymNq8Xi2lYfnyJsHv0LQqNk9SrHJqUG3s1LIhu7U7M/h7bzoxbPtPYrJvv4liey ID9xiK6VQ9oeHYo6nQfwVeQIGf6okxhtuJXnxHqZRjSuIvSmc93igeQcasSCGqxcZBYG W2gDLZ76xKg+MRg4IHvmDwsoh1vfKw+XGMT5ejk0CEAPce8eU+Ka+O17h6zENV3oVWuC L48hlSuK6mrfn3vbcjv5QZxYdscgc3evc4ChfPGuDHI42nKS7KHXRM2q1MXjLYQIG4KP qZDQ== 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=dhhLishrNzqQojtmIQa2z/yazpLqotI9DaMpeMJjO8o=; b=CsgYH8fiCrrKBtTtgjGDnoi/vHbSe0VGzJF182wRXfgWV+3aij/9rC5L/5YfDa06FV 5U8biO4m1Zd5jPWofr7cR/yDm5hMwvwgB8KmXirF6duD48jp8DaaOPHbN95m0DyKdjL1 HxwV6NToKSXOZ4fyVIVMmLoLsMv9lxASmRWq5cWQ9ecuUi9XfYwUU1Wd8C4Abg3LtQEl X9uWKzOeg2gYsBZtAXxLUOVWdYStiKmsrff3idqVPwcnzwQIo/xL0CNzL+rqJC0rxEI2 i73P1OH2AU2mGuxKc1teVMVvCLG7QyzwwTG6xG2l2z3lcpbN9FvED5qFPxtN2dUhVbxc OIsw== 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 g8-v6si9521356plo.245.2018.05.01.06.50.37; Tue, 01 May 2018 06:50:51 -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 S1755787AbeEANs6 (ORCPT + 99 others); Tue, 1 May 2018 09:48:58 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:45934 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755188AbeEANsz (ORCPT ); Tue, 1 May 2018 09:48:55 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w41Dk2VE037807 for ; Tue, 1 May 2018 09:48:54 -0400 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 2hpnts0e31-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 01 May 2018 09:48:54 -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:51 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) 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:46 +0100 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w41DmklU8257856; Tue, 1 May 2018 13:48:46 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A239442042; Tue, 1 May 2018 14:39:59 +0100 (BST) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E5F734203F; Tue, 1 May 2018 14:39:57 +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:57 +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 , "Serge E . Hallyn" , Stephen Boyd Subject: [PATCH 5/6] ima: verify kernel firmware signatures when using a preallocated buffer Date: Tue, 1 May 2018 09:48:22 -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-00000434CDA2 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18050113-0041-0000-0000-00002638E68D Message-Id: <1525182503-13849-6-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 Don't differentiate between kernel_read_file_id READING_FIRMWARE and READING_FIRMWARE_PREALLOC_BUFFER enumerations. Fixes: a098ecd firmware: support loading into a pre-allocated buffer (since 4.8) Signed-off-by: Mimi Zohar Cc: Luis R. Rodriguez Cc: David Howells Cc: Kees Cook Cc: Serge E. Hallyn Cc: Stephen Boyd --- security/integrity/ima/ima_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 71b5a51c6709..eb9c273ab81d 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -469,6 +469,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_FIRMWARE_PREALLOC_BUFFER] = FIRMWARE_CHECK, [READING_MODULE] = MODULE_CHECK, [READING_KEXEC_IMAGE] = KEXEC_KERNEL_CHECK, [READING_KEXEC_INITRAMFS] = KEXEC_INITRAMFS_CHECK, -- 2.7.5