From patchwork Sat Feb 3 01:21:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morris X-Patchwork-Id: 10198257 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 74F2A60467 for ; Sat, 3 Feb 2018 01:22:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60C3628FBE for ; Sat, 3 Feb 2018 01:22:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5570A28FC4; Sat, 3 Feb 2018 01:22:03 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 0CE7C28FBE for ; Sat, 3 Feb 2018 01:22:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752117AbeBCBWB (ORCPT ); Fri, 2 Feb 2018 20:22:01 -0500 Received: from namei.org ([65.99.196.166]:47770 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751470AbeBCBWB (ORCPT ); Fri, 2 Feb 2018 20:22:01 -0500 Received: from localhost (localhost [127.0.0.1]) by namei.org (8.14.4/8.14.4) with ESMTP id w131Lv9H013680; Sat, 3 Feb 2018 01:21:57 GMT Date: Sat, 3 Feb 2018 12:21:57 +1100 (AEDT) From: James Morris To: Linus Torvalds cc: linux-security-module@vger.kernel.org Subject: [GIT PULL] integrity fixes for v4.16-rc1 Message-ID: User-Agent: Alpine 2.21 (LRH 202 2017-01-01) MIME-Version: 1.0 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Please pull these updates: - Add James Bottommley as a Trusted Keys maintainer. - IMA: re-initialize iint->atomic_flags on iint_free(), from Mimi. The following changes since commit 4bf772b14675411a69b3c807f73006de0fe4b649: Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux (2018-02-01 17:48:47 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git fixes-v4.16-rc1 for you to fetch changes up to e2598077dc6a26c9644393e5c21f22a90dbdccdb: ima: re-initialize iint->atomic_flags (2018-02-02 21:03:08 +1100) ---------------------------------------------------------------- Mimi Zohar (2): maintainers: update trusted keys ima: re-initialize iint->atomic_flags MAINTAINERS | 1 + security/integrity/iint.c | 1 + 2 files changed, 2 insertions(+) --- -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/MAINTAINERS b/MAINTAINERS index 4c104db..10ba368 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7792,6 +7792,7 @@ F: include/keys/encrypted-type.h F: security/keys/encrypted-keys/ KEYS-TRUSTED +M: James Bottomley M: Mimi Zohar L: linux-integrity@vger.kernel.org L: keyrings@vger.kernel.org diff --git a/security/integrity/iint.c b/security/integrity/iint.c index fc38ca0..9700e96 100644 --- a/security/integrity/iint.c +++ b/security/integrity/iint.c @@ -74,6 +74,7 @@ static void iint_free(struct integrity_iint_cache *iint) iint->ima_hash = NULL; iint->version = 0; iint->flags = 0UL; + iint->atomic_flags = 0UL; iint->ima_file_status = INTEGRITY_UNKNOWN; iint->ima_mmap_status = INTEGRITY_UNKNOWN; iint->ima_bprm_status = INTEGRITY_UNKNOWN;