* [PATCH 2/2] seccomp: fix build warnings when there is no CONFIG_SECCOMP_FILTER
[not found] <1334692161-6834-1-git-send-email-wad@chromium.org>
@ 2012-04-17 19:48 ` Will Drewry
2012-04-18 2:39 ` James Morris
0 siblings, 1 reply; 3+ messages in thread
From: Will Drewry @ 2012-04-17 19:48 UTC (permalink / raw)
To: jmorris
Cc: linux-kernel, sfr, linux-security-module, Will Drewry,
Eric Paris, James Morris, Kees Cook, Serge Hallyn
If both audit and seccomp filter support are disabled, 'ret' is marked
as unused.
If just seccomp filter support is disabled, data and skip are considered
unused.
This change fixes those build warnings.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Will Drewry <wad@chromium.org>
Acked-by: Kees Cook <keescook@chromium.org>
---
kernel/seccomp.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index d9db6ec..ee376be 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -377,8 +377,7 @@ int __secure_computing(int this_syscall)
int mode = current->seccomp.mode;
int exit_sig = 0;
int *syscall;
- u32 ret = SECCOMP_RET_KILL;
- int data;
+ u32 ret;
switch (mode) {
case SECCOMP_MODE_STRICT:
@@ -392,12 +391,15 @@ int __secure_computing(int this_syscall)
return 0;
} while (*++syscall);
exit_sig = SIGKILL;
+ ret = SECCOMP_RET_KILL;
break;
#ifdef CONFIG_SECCOMP_FILTER
- case SECCOMP_MODE_FILTER:
+ case SECCOMP_MODE_FILTER: {
+ int data;
ret = seccomp_run_filters(this_syscall);
data = ret & SECCOMP_RET_DATA;
- switch (ret & SECCOMP_RET_ACTION) {
+ ret &= SECCOMP_RET_ACTION;
+ switch (ret) {
case SECCOMP_RET_ERRNO:
/* Set the low-order 16-bits as a errno. */
syscall_set_return_value(current, task_pt_regs(current),
@@ -432,6 +434,7 @@ int __secure_computing(int this_syscall)
}
exit_sig = SIGSYS;
break;
+ }
#endif
default:
BUG();
@@ -442,8 +445,10 @@ int __secure_computing(int this_syscall)
#endif
audit_seccomp(this_syscall, exit_sig, ret);
do_exit(exit_sig);
+#ifdef CONFIG_SECCOMP_FILTER
skip:
audit_seccomp(this_syscall, exit_sig, ret);
+#endif
return -1;
}
--
1.7.5.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] seccomp: fix build warnings when there is no CONFIG_SECCOMP_FILTER
2012-04-17 19:48 ` [PATCH 2/2] seccomp: fix build warnings when there is no CONFIG_SECCOMP_FILTER Will Drewry
@ 2012-04-18 2:39 ` James Morris
2012-04-18 2:58 ` Will Drewry
0 siblings, 1 reply; 3+ messages in thread
From: James Morris @ 2012-04-18 2:39 UTC (permalink / raw)
To: Will Drewry
Cc: linux-kernel, sfr, linux-security-module, Eric Paris,
James Morris, Kees Cook, Serge Hallyn
Both applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] seccomp: fix build warnings when there is no CONFIG_SECCOMP_FILTER
2012-04-18 2:39 ` James Morris
@ 2012-04-18 2:58 ` Will Drewry
0 siblings, 0 replies; 3+ messages in thread
From: Will Drewry @ 2012-04-18 2:58 UTC (permalink / raw)
To: James Morris
Cc: linux-kernel, sfr, linux-security-module, Eric Paris,
James Morris, Kees Cook, Serge Hallyn
On Tue, Apr 17, 2012 at 9:39 PM, James Morris <jmorris@namei.org> wrote:
> Both applied to
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next
>
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-18 2:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1334692161-6834-1-git-send-email-wad@chromium.org>
2012-04-17 19:48 ` [PATCH 2/2] seccomp: fix build warnings when there is no CONFIG_SECCOMP_FILTER Will Drewry
2012-04-18 2:39 ` James Morris
2012-04-18 2:58 ` Will Drewry
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®