Re: [PATCH] Fix the kernel panic of audit_filter_task when key fieldis set

[zhangxiliang]

Sorry, I miss a blank between if and "(". 
And I add "unlikely" to check "ctx" in audit_match_perm() and audit_match_filetype().
This is a new patch for it.

Signed-off-by: Zhang Xiliang <zhangxiliang@xxxxxxxxxxxxxx>
---
 kernel/auditsc.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 4699950..57a001a 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -243,6 +243,9 @@ static inline int open_arg(int flags, int mask)
 
 static int audit_match_perm(struct audit_context *ctx, int mask)
 {
+	if (unlikely(!ctx))
+		return 0;
+
 	unsigned n = ctx->major;
 	switch (audit_classify_syscall(ctx->arch, n)) {
 	case 0:	/* native */
@@ -284,6 +287,10 @@ static int audit_match_filetype(struct audit_context *ctx, int which)
 {
 	unsigned index = which & ~S_IFMT;
 	mode_t mode = which & S_IFMT;
+
+	if (unlikely(!ctx))
+		return 0;
+
 	if (index >= ctx->name_count)
 		return 0;
 	if (ctx->names[index].ino == -1)

Yu Zhiguo said the following on 2008-08-02 10:51:
> 
> zhangxiliang wrote:
> 
>>  static int audit_match_perm(struct audit_context *ctx, int mask)
>>  {
>> +    if(!ctx)
>> +        return 0;
>>      unsigned n = ctx->major;
> 
> Please check this patch with scripts/checkpatch.pl and then resend it.
> 
> 
>>      switch (audit_classify_syscall(ctx->arch, n)) {
>>      case 0:    /* native */
>> @@ -284,6 +286,8 @@ static int audit_match_filetype(struct
>> audit_context *ctx, int which)
>>  {
>>      unsigned index = which & ~S_IFMT;
>>      mode_t mode = which & S_IFMT;
>> +    if(!ctx)
>> +        return 0;
>>      if (index >= ctx->name_count)
>>          return 0;
>>      if (ctx->names[index].ino == -1)
>>
>>
> 
> 
> 
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/