diff options
| author | Huang, Tao <huangtao@rock-chips.com> | 2017-06-07 10:03:03 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2017-06-07 10:03:03 +0800 |
| commit | ad2fc3b29a8b0f1e1c0cd40a84ea065feb2c8fbb (patch) | |
| tree | e26779e9956d05689bd3a2ada93e6c5ecb1c43da /security | |
| parent | d7f4e179e350791bf6895267894dc3d5a8cdd27b (diff) | |
| parent | 000f3de5a9866b1b3feb9ca4f66ca6a884d1d42f (diff) | |
Merge tag 'lsk-v4.4-17.05-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
LSK 17.05 v4.4-android
* tag 'lsk-v4.4-17.05-android': (266 commits)
BACKPORT: mm/slab: clean up DEBUG_PAGEALLOC processing code
Linux 4.4.70
UPSTREAM: arm64: hibernate: Support DEBUG_PAGEALLOC
BACKPORT: arm64: vmlinux.ld: Add mmuoff data sections and move mmuoff text into idmap
BACKPORT: arm64: Create sections.h
ANDROID: uid_sys_stats: defer io stats calulation for dead tasks
ANDROID: AVB: Fix linter errors.
ANDROID: AVB: Fix invalidate_vbmeta_submit().
drivers: char: mem: Check for address space wraparound with mmap()
nfsd: encoders mustn't use unitialized values in error cases
drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2
PCI: Freeze PME scan before suspending devices
PCI: Fix pci_mmap_fits() for HAVE_PCI_RESOURCE_TO_USER platforms
tracing/kprobes: Enforce kprobes teardown after testing
osf_wait4(): fix infoleak
genirq: Fix chained interrupt data ordering
uwb: fix device quirk on big-endian hosts
metag/uaccess: Check access_ok in strncpy_from_user
metag/uaccess: Fix access_ok()
iommu/vt-d: Flush the IOTLB to get rid of the initial kdump mappings
...
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/ima_appraise.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index ed5a9c110b3a..9ce9d5003dcc 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -203,10 +203,11 @@ int ima_appraise_measurement(int func, struct integrity_iint_cache *iint, cause = "missing-hash"; status = INTEGRITY_NOLABEL; - if (opened & FILE_CREATED) { + if (opened & FILE_CREATED) iint->flags |= IMA_NEW_FILE; + if ((iint->flags & IMA_NEW_FILE) && + !(iint->flags & IMA_DIGSIG_REQUIRED)) status = INTEGRITY_PASS; - } goto out; } |