mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	Merge branch 'audit.b56' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b56' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: Re: [PATCH] Fix the kernel panic of audit_filter_task when key field is set
This commit is contained in:
		
						commit
						b13ad6f47c
					
				
					 1 changed files with 7 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue