From bb194f81906f9f3c57d75aa53a43069c9ebf4b40 Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Wed, 2 Sep 2009 11:40:32 -0400 Subject: [PATCH] --- yaml --- r: 157347 b: refs/heads/master c: 6c1488fd581a447ec87c4b59f0d33f95f0aa441b h: refs/heads/master i: 157345: 71e29e1af42b3f26e110781a828cf5e427155cdf 157343: 39d973eceff62b72f950e28d75f2b568790271a4 v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9171beec867c..430e79b830b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee18d64c1f632043a02e6f5ba5e045bb26a5465f +refs/heads/master: 6c1488fd581a447ec87c4b59f0d33f95f0aa441b diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index f3c5b278895a..ee01308a01d1 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -1533,9 +1533,11 @@ int may_open(struct path *path, int acc_mode, int flag) if (error) return error; - error = ima_path_check(path, - acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC), + error = ima_path_check(path, acc_mode ? + acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC) : + ACC_MODE(flag) & (MAY_READ | MAY_WRITE), IMA_COUNT_UPDATE); + if (error) return error; /*