Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 310158 Details for
Bug 452577
Actual & placeholder funcs have differing param counts
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
RHEL5 fix for this issue
452577.patch (text/plain), 6.24 KB, created by
Prarit Bhargava
on 2008-06-24 16:01:57 UTC
(
hide
)
Description:
RHEL5 fix for this issue
Filename:
MIME Type:
Creator:
Prarit Bhargava
Created:
2008-06-24 16:01:57 UTC
Size:
6.24 KB
patch
obsolete
>Current RHEL5 tree will not compile if CONFIG_AUDITSYSCALL is deselected from >the .config. > >Successfully tested by me. > >Resolves BZ 452577. > >diff -urNp -X linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/include/net/xfrm.h linux-2.6.18.i386/include/net/xfrm.h >--- linux-2.6.18.i386.orig/include/net/xfrm.h 2008-06-24 08:50:15.000000000 -0400 >+++ linux-2.6.18.i386/include/net/xfrm.h 2008-06-24 11:13:41.000000000 -0400 >@@ -429,8 +429,8 @@ static inline struct audit_buffer *xfrm_ > #else > #define xfrm_audit_log(a,s,t,r,p,x) do { ; } while (0) > #define xfrm_audit_state_replay_overflow(x, s) do { ; } while (0) >-#define xfrm_audit_state_replay(s, f, sp, sq) do { ; } while (0) >-#define xfrm_naudit_state_replay(s, f, sp, sq) do { ; } while (0) >+#define xfrm_audit_state_replay(s, sp, sq) do { ; } while (0) >+#define xfrm_naudit_state_replay(s, sp, sq) do { ; } while (0) > #define xfrm_audit_state_notfound(s, f, sp, sq) do { ; } while (0) > #define xfrm_naudit_state_notfound(s, f, sp, sq) do { ; } while (0) > #define xfrm_audit_state_icvfail(x, s, p) do { ; } while (0) >diff -urNp -X linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/kernel/audit.c linux-2.6.18.i386/kernel/audit.c >--- linux-2.6.18.i386.orig/kernel/audit.c 2008-06-24 08:50:14.000000000 -0400 >+++ linux-2.6.18.i386/kernel/audit.c 2008-06-24 11:36:45.000000000 -0400 >@@ -469,6 +469,7 @@ int audit_send_list(void *_dest) > return 0; > } > >+#ifdef CONFIG_AUDITSYSCALL > static int prune_tree_thread(void *unused) > { > mutex_lock(&audit_cmd_mutex); >@@ -481,6 +482,7 @@ void audit_schedule_prune(void) > { > kthread_run(prune_tree_thread, NULL, "audit_prune_tree"); > } >+#endif > > struct sk_buff *audit_make_reply(int pid, int seq, int type, int done, > int multi, void *payload, int size) >@@ -761,6 +763,7 @@ static int audit_receive_msg(struct sk_b > uid, seq, data, nlmsg_len(nlh), > loginuid, sid); > break; >+#ifdef CONFIG_AUDITSYSCALL > case AUDIT_TRIM: > audit_trim_trees(); > ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE); >@@ -826,6 +829,7 @@ static int audit_receive_msg(struct sk_b > kfree(new); > break; > } >+#endif > case AUDIT_SIGNAL_INFO: > err = selinux_ctxid_to_string(audit_sig_sid, &ctx, &len); > if (err) >diff -urNp -X linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/kernel/auditfilter.c linux-2.6.18.i386/kernel/auditfilter.c >--- linux-2.6.18.i386.orig/kernel/auditfilter.c 2008-06-24 08:50:14.000000000 -0400 >+++ linux-2.6.18.i386/kernel/auditfilter.c 2008-06-24 11:44:34.000000000 -0400 >@@ -325,6 +325,7 @@ static inline int audit_match_class_bits > return 1; > } > >+#ifdef CONFIG_AUDITSYSCALL > static int audit_match_signal(struct audit_entry *entry) > { > struct audit_field *arch = entry->rule.arch_f; >@@ -349,6 +350,7 @@ static int audit_match_signal(struct aud > return 1; > } > } >+#endif > > /* Common user-space to kernel rule translation. */ > static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) >@@ -622,6 +624,7 @@ static struct audit_entry *audit_data_to > goto exit_free; > } > break; >+#ifdef CONFIG_AUDITSYSCALL > case AUDIT_DIR: > str = audit_unpack_string(&bufp, &remain, f->val); > if (IS_ERR(str)) >@@ -633,6 +636,7 @@ static struct audit_entry *audit_data_to > if (err) > goto exit_free; > break; >+#endif > case AUDIT_INODE: > err = audit_to_inode(&entry->rule, f); > if (err) >@@ -759,11 +763,13 @@ static struct audit_rule_data *audit_kru > data->buflen += data->values[i] = > audit_pack_string(&bufp, krule->watch->path); > break; >+#ifdef CONFIG_AUDITSYSCALL > case AUDIT_DIR: > data->buflen += data->values[i] = > audit_pack_string(&bufp, > audit_tree_path(krule->tree)); > break; >+#endif > case AUDIT_FILTERKEY: > data->buflen += data->values[i] = > audit_pack_string(&bufp, krule->filterkey); >@@ -812,11 +818,13 @@ static int audit_compare_rule(struct aud > if (strcmp(a->watch->path, b->watch->path)) > return 1; > break; >+#ifdef CONFIG_AUDITSYSCALL > case AUDIT_DIR: > if (strcmp(audit_tree_path(a->tree), > audit_tree_path(b->tree))) > return 1; > break; >+#endif > case AUDIT_FILTERKEY: > /* both filterkeys exist based on above type compare */ > if (strcmp(a->filterkey, b->filterkey)) >@@ -1254,10 +1262,10 @@ static inline int audit_add_rule(struct > struct audit_entry *e; > struct audit_field *inode_f = entry->rule.inode_f; > struct audit_watch *watch = entry->rule.watch; >- struct audit_tree *tree = entry->rule.tree; > struct nameidata *ndp, *ndw; > int h, err, putnd_needed = 0; > #ifdef CONFIG_AUDITSYSCALL >+ struct audit_tree *tree = entry->rule.tree; > int dont_count = 0; > > /* If either of these, don't count towards total */ >@@ -1276,9 +1284,11 @@ static inline int audit_add_rule(struct > mutex_unlock(&audit_filter_mutex); > if (e) { > err = -EEXIST; >+#ifdef CONFIG_AUDITSYSCALL > /* normally audit_add_tree_rule() will free it on failure */ > if (tree) > audit_put_tree(tree); >+#endif > goto error; > } > >@@ -1301,6 +1311,7 @@ static inline int audit_add_rule(struct > h = audit_hash_ino((u32)watch->ino); > list = &audit_inode_hash[h]; > } >+#ifdef CONFIG_AUDITSYSCALL > if (tree) { > err = audit_add_tree_rule(&entry->rule); > if (err) { >@@ -1308,6 +1319,7 @@ static inline int audit_add_rule(struct > goto error; > } > } >+#endif > > if (entry->rule.flags & AUDIT_FILTER_PREPEND) { > list_add_rcu(&entry->list, list); >@@ -1344,10 +1356,10 @@ static inline int audit_del_rule(struct > struct audit_entry *e; > struct audit_field *inode_f = entry->rule.inode_f; > struct audit_watch *watch, *tmp_watch = entry->rule.watch; >- struct audit_tree *tree = entry->rule.tree; > LIST_HEAD(inotify_list); > int h, ret = 0; > #ifdef CONFIG_AUDITSYSCALL >+ struct audit_tree *tree = entry->rule.tree; > int dont_count = 0; > > /* If either of these, don't count towards total */ >@@ -1389,8 +1401,10 @@ static inline int audit_del_rule(struct > } > } > >+#ifdef CONFIG_AUDITSYSCALL > if (e->rule.tree) > audit_remove_tree_rule(&e->rule); >+#endif > > list_del_rcu(&e->list); > call_rcu(&e->rcu, audit_free_rule_rcu); >@@ -1410,8 +1424,10 @@ static inline int audit_del_rule(struct > out: > if (tmp_watch) > audit_put_watch(tmp_watch); /* match initial get */ >+#ifdef CONFIG_AUDITSYSCALL > if (tree) > audit_put_tree(tree); /* that's the temporary one */ >+#endif > > return ret; > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 452577
:
310071
| 310158