Jelajahi Sumber

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

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@cn.fujitsu.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
zhangxiliang 17 tahun lalu
induk
melakukan
1a61c88def
1 mengubah file dengan 7 tambahan dan 0 penghapusan
  1. 7 0
      kernel/auditsc.c

+ 7 - 0
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)
 static int audit_match_perm(struct audit_context *ctx, int mask)
 {
 {
+	if (unlikely(!ctx))
+		return 0;
+
 	unsigned n = ctx->major;
 	unsigned n = ctx->major;
 	switch (audit_classify_syscall(ctx->arch, n)) {
 	switch (audit_classify_syscall(ctx->arch, n)) {
 	case 0:	/* native */
 	case 0:	/* native */
@@ -284,6 +287,10 @@ static int audit_match_filetype(struct audit_context *ctx, int which)
 {
 {
 	unsigned index = which & ~S_IFMT;
 	unsigned index = which & ~S_IFMT;
 	mode_t mode = which & S_IFMT;
 	mode_t mode = which & S_IFMT;
+
+	if (unlikely(!ctx))
+		return 0;
+
 	if (index >= ctx->name_count)
 	if (index >= ctx->name_count)
 		return 0;
 		return 0;
 	if (ctx->names[index].ino == -1)
 	if (ctx->names[index].ino == -1)