[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/devel linux-2.6.13-audit-git.patch,1.1.2.1,1.1.2.2



Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10753

Modified Files:
      Tag: private-dwmw2-20050817-rawhide-test-branch
	linux-2.6.13-audit-git.patch 
Log Message:
fix patch breakage

linux-2.6.13-audit-git.patch:
 MAINTAINERS                    |    5 
 fs/namei.c                     |    2 
 include/linux/audit.h          |   36 ++--
 kernel/audit.c                 |  128 ++++++++++------
 kernel/auditsc.c               |  321 ++++++++++++++++++++++++++++-------------
 security/selinux/avc.c         |    4 
 security/selinux/hooks.c       |    2 
 security/selinux/ss/services.c |    4 
 8 files changed, 336 insertions(+), 166 deletions(-)

Index: linux-2.6.13-audit-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6.13-audit-git.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6.13-audit-git.patch	17 Aug 2005 14:23:44 -0000	1.1.2.1
+++ linux-2.6.13-audit-git.patch	17 Aug 2005 15:08:41 -0000	1.1.2.2
@@ -563,7 +563,7 @@
  {
  	struct audit_entry *e = container_of(head, struct audit_entry, rcu);
  	kfree(e);
-@@ -245,82 +301,83 @@ static inline int audit_del_rule(struct 
+@@ -245,82 +301,82 @@ static inline int audit_del_rule(struct 
  			return 0;
  		}
  	}
@@ -574,7 +574,6 @@
 -/* Copy rule from user-space to kernel-space.  Called during
 - * AUDIT_ADD. */
 -static int audit_copy_rule(struct audit_rule *d, struct audit_rule *s)
-+#ifdef CONFIG_NET
 +static int audit_list_rules(void *_dest)
  {
 +	int pid, seq;
@@ -702,7 +701,7 @@
  		break;
  	default:
  		return -EINVAL;
-@@ -454,7 +511,7 @@ static enum audit_state audit_filter_tas
+@@ -454,7 +510,7 @@ static enum audit_state audit_filter_tas
  	enum audit_state   state;
  
  	rcu_read_lock();
@@ -711,7 +710,7 @@
  		if (audit_filter_rules(tsk, &e->rule, NULL, &state)) {
  			rcu_read_unlock();
  			return state;
-@@ -474,20 +531,84 @@ static enum audit_state audit_filter_sys
+@@ -474,20 +530,84 @@ static enum audit_state audit_filter_sys
  					     struct list_head *list)
  {
  	struct audit_entry *e;
@@ -804,7 +803,7 @@
  }
  
  /* This should be called with task_lock() held. */
-@@ -504,7 +625,7 @@ static inline struct audit_context *audi
+@@ -504,7 +624,7 @@ static inline struct audit_context *audi
  
  	if (context->in_syscall && !context->auditable) {
  		enum audit_state state;
@@ -813,7 +812,7 @@
  		if (state == AUDIT_RECORD_CONTEXT)
  			context->auditable = 1;
  	}
-@@ -679,13 +800,13 @@ static void audit_log_task_info(struct a
+@@ -679,13 +799,13 @@ static void audit_log_task_info(struct a
  	up_read(&mm->mmap_sem);
  }
  
@@ -829,7 +828,7 @@
  	if (!ab)
  		return;		/* audit_panic has been called */
  	audit_log_format(ab, "arch=%x syscall=%d",
-@@ -717,7 +838,7 @@ static void audit_log_exit(struct audit_
+@@ -717,7 +837,7 @@ static void audit_log_exit(struct audit_
  
  	for (aux = context->aux; aux; aux = aux->next) {
  
@@ -838,7 +837,7 @@
  		if (!ab)
  			continue; /* audit_panic has been called */
  
-@@ -754,14 +875,14 @@ static void audit_log_exit(struct audit_
+@@ -754,14 +874,14 @@ static void audit_log_exit(struct audit_
  	}
  
  	if (context->pwd && context->pwdmnt) {
@@ -855,7 +854,7 @@
  		if (!ab)
  			continue; /* audit_panic has been called */
  
-@@ -770,6 +891,8 @@ static void audit_log_exit(struct audit_
+@@ -770,6 +890,8 @@ static void audit_log_exit(struct audit_
  			audit_log_format(ab, " name=");
  			audit_log_untrustedstring(ab, context->names[i].name);
  		}
@@ -864,7 +863,7 @@
  		if (context->names[i].ino != (unsigned long)-1)
  			audit_log_format(ab, " inode=%lu dev=%02x:%02x mode=%#o"
  					     " ouid=%u ogid=%u rdev=%02x:%02x",
-@@ -799,9 +922,11 @@ void audit_free(struct task_struct *tsk)
+@@ -799,9 +921,11 @@ void audit_free(struct task_struct *tsk)
  		return;
  
  	/* Check for system calls that do not go through the exit
@@ -879,7 +878,7 @@
  
  	audit_free_context(context);
  }
-@@ -876,11 +1001,11 @@ void audit_syscall_entry(struct task_str
+@@ -876,11 +1000,11 @@ void audit_syscall_entry(struct task_str
  
  	state = context->state;
  	if (state == AUDIT_SETUP_CONTEXT || state == AUDIT_BUILD_CONTEXT)
@@ -893,7 +892,7 @@
  	context->ctime      = CURRENT_TIME;
  	context->in_syscall = 1;
  	context->auditable  = !!(state == AUDIT_RECORD_CONTEXT);
-@@ -903,10 +1028,10 @@ void audit_syscall_exit(struct task_stru
+@@ -903,10 +1027,10 @@ void audit_syscall_exit(struct task_stru
  	/* Not having a context here is ok, since the parent may have
  	 * called __put_task_struct. */
  	if (likely(!context))
@@ -907,7 +906,7 @@
  
  	context->in_syscall = 0;
  	context->auditable  = 0;
-@@ -919,9 +1044,9 @@ void audit_syscall_exit(struct task_stru
+@@ -919,9 +1043,9 @@ void audit_syscall_exit(struct task_stru
  	} else {
  		audit_free_names(context);
  		audit_free_aux(context);
@@ -918,7 +917,7 @@
  	put_task_struct(tsk);
  }
  
-@@ -996,7 +1121,7 @@ void audit_putname(const char *name)
+@@ -996,7 +1120,7 @@ void audit_putname(const char *name)
  
  /* Store the inode and device from a lookup.  Called from
   * fs/namei.c:path_lookup(). */
@@ -927,7 +926,7 @@
  {
  	int idx;
  	struct audit_context *context = current->audit_context;
-@@ -1022,17 +1147,20 @@ void audit_inode(const char *name, const
+@@ -1022,17 +1146,20 @@ void audit_inode(const char *name, const
  		++context->ino_count;
  #endif
  	}
@@ -954,7 +953,7 @@
  	t->tv_sec  = ctx->ctime.tv_sec;
  	t->tv_nsec = ctx->ctime.tv_nsec;
  	*serial    = ctx->serial;
-@@ -1044,7 +1172,7 @@ int audit_set_loginuid(struct task_struc
+@@ -1044,7 +1171,7 @@ int audit_set_loginuid(struct task_struc
  	if (task->audit_context) {
  		struct audit_buffer *ab;
  
@@ -963,7 +962,7 @@
  		if (ab) {
  			audit_log_format(ab, "login pid=%d uid=%u "
  				"old auid=%u new auid=%u",
-@@ -1153,7 +1281,7 @@ void audit_signal_info(int sig, struct t
+@@ -1153,7 +1280,7 @@ void audit_signal_info(int sig, struct t
  	extern pid_t audit_sig_pid;
  	extern uid_t audit_sig_uid;
  


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]