2009-06-26 15:24:24

by Mimi Zohar

Subject: [PATCH] integrity: ima mq_open imbalance msg fix

This patch fixes an imbalance message as reported by Sanchin Sant.
As we don't need to measure the message queue, just increment the
counters.

Signed-off-by: Mimi Zohar <[email protected]>
---
ipc/mqueue.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index e35ba2c..c5e68ad 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -32,6 +32,7 @@
#include <linux/nsproxy.h>
#include <linux/pid.h>
#include <linux/ipc_namespace.h>
+#include <linux/ima.h>

#include <net/sock.h>
#include "util.h"
@@ -733,6 +734,7 @@ SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode,
error = PTR_ERR(filp);
goto out_putfd;
}
+ ima_counts_get(filp);

fd_install(fd, filp);
goto out_upsem;
--
1.6.0.6

2009-06-26 15:28:36

by Serge E. Hallyn

Subject: Re: [PATCH] integrity: ima mq_open imbalance msg fix

Quoting Mimi Zohar ([email protected]):
> This patch fixes an imbalance message as reported by Sanchin Sant.
> As we don't need to measure the message queue, just increment the
> counters.
>
> Signed-off-by: Mimi Zohar <[email protected]>

Acked-by: Serge Hallyn <[email protected]>

Thanks, Mimi and Sanchin.

-serge

> ---
> ipc/mqueue.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/ipc/mqueue.c b/ipc/mqueue.c
> index e35ba2c..c5e68ad 100644
> --- a/ipc/mqueue.c
> +++ b/ipc/mqueue.c
> @@ -32,6 +32,7 @@
> #include <linux/nsproxy.h>
> #include <linux/pid.h>
> #include <linux/ipc_namespace.h>
> +#include <linux/ima.h>
>
> #include <net/sock.h>
> #include "util.h"
> @@ -733,6 +734,7 @@ SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode,
> error = PTR_ERR(filp);
> goto out_putfd;
> }
> + ima_counts_get(filp);
>
> fd_install(fd, filp);
> goto out_upsem;
> --
> 1.6.0.6