4:32 a.m.
The patch titled
git-audit-master build fix
has been added to the -mm tree. Its filename is
git-audit-master-build-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Andrew Morton <akpm(a)osdl.org>
CONFIG_AUDIT=y, CONFIG_AUDITSYSCALL=n:
kernel/auditfilter.c: In function `audit_add_rule':
kernel/auditfilter.c:329: error: invalid lvalue in increment
kernel/auditfilter.c: In function `audit_del_rule':
kernel/auditfilter.c:348: error: invalid lvalue in increment
kernel/auditfilter.c:350: error: invalid lvalue in decrement
possibly-hacky-fix:
Cc: <linux-audit(a)redhat.com>
Cc: Al Viro <viro(a)ftp.linux.org.uk>
Signed-off-by: Andrew Morton <akpm(a)osdl.org>
---
include/linux/audit.h | 5 +++--
kernel/audit.c | 3 +++
kernel/auditsc.c | 3 ---
auditfilter.c | 0
4 files changed, 6 insertions(+), 5 deletions(-)
diff -puN include/linux/audit.h~git-audit-master-build-fix include/linux/audit.h
--- 25-alpha/include/linux/audit.h~git-audit-master-build-fix 2006-03-03
02:26:45.000000000 -0800
+++ 25-alpha-akpm/include/linux/audit.h 2006-03-03 02:27:11.000000000 -0800
@@ -283,6 +283,9 @@ struct netlink_skb_parms;
#define AUDITSC_SUCCESS 1
#define AUDITSC_FAILURE 2
#define AUDITSC_RESULT(x) ( ((long)(x))<0?AUDITSC_FAILURE:AUDITSC_SUCCESS )
+
+extern int audit_n_rules;
+
#ifdef CONFIG_AUDITSYSCALL
/* These are defined in auditsc.c */
/* Public API */
@@ -321,7 +324,6 @@ extern int audit_sockaddr(int len, void
extern int audit_avc_path(struct dentry *dentry, struct vfsmount *mnt);
extern void audit_signal_info(int sig, struct task_struct *t);
extern int audit_set_macxattr(const char *name);
-extern int audit_n_rules;
static inline int audit_invoke_entry(void)
{
if (likely(!current->audit_context))
@@ -354,7 +356,6 @@ static inline int audit_invoke_exit(void
#define audit_avc_path(dentry, mnt) ({ 0; })
#define audit_signal_info(s,t) do { ; } while (0)
#define audit_set_macxattr(n) do { ; } while (0)
-#define audit_n_rules 0
#define audit_invoke_entry() ({ 0; })
#define audit_invoke_exit() ({ 0; })
#endif
diff -puN kernel/auditfilter.c~git-audit-master-build-fix kernel/auditfilter.c
diff -puN kernel/auditsc.c~git-audit-master-build-fix kernel/auditsc.c
--- 25-alpha/kernel/auditsc.c~git-audit-master-build-fix 2006-03-03 02:28:02.000000000
-0800
+++ 25-alpha-akpm/kernel/auditsc.c 2006-03-03 02:28:24.000000000 -0800
@@ -75,9 +75,6 @@ extern int audit_enabled;
* path_lookup. */
#define AUDIT_NAMES_RESERVED 7
-/* number of audit rules */
-int audit_n_rules;
-
/* When fs/namei.c:getname() is called, we store the pointer in name and
* we don't let putname() free it (instead we free all of the saved
* pointers at syscall exit time).
diff -puN kernel/audit.c~git-audit-master-build-fix kernel/audit.c
--- 25-alpha/kernel/audit.c~git-audit-master-build-fix 2006-03-03 02:28:09.000000000
-0800
+++ 25-alpha-akpm/kernel/audit.c 2006-03-03 02:28:32.000000000 -0800
@@ -56,6 +56,9 @@
#include <linux/skbuff.h>
#include <linux/netlink.h>
+/* number of audit rules */
+int audit_n_rules;
+
/* No auditing will take place until audit_initialized != 0.
* (Initialization happens after skb_init is called.) */
static int audit_initialized;
_
Patches currently in -mm which might be from akpm(a)osdl.org are
linus.patch
i386-port-ati-timer-fix-from-x86_64-to-i386-ii-fixes.patch
fix-ide-locking-error-tidy.patch
multiple-exports-of-strpbrk.patch
git-acpi-up-fix.patch
git-acpi-up-fix-2.patch
git-alsa.patch
git-audit-master.patch
git-audit-fixes.patch
revert-gregkh-driver-put_device-might_sleep.patch
revert-gregkh-driver-fix-up-the-sysfs-pollable-patch.patch
revert-gregkh-driver-allow-sysfs-attribute-files-to-be-pollable.patch
sysfs_h-cleanup.patch
get_cpu_sysdev-signedness-fix.patch
topologyc-tweaks.patch
cpuc-section-fixes.patch
git-dvb.patch
git-infiniband-build-fix.patch
git-input.patch
input-pcspkr-device-and-driver-separation-fix.patch
input-pcspkr-device-and-driver-separation-fix-2.patch
input-pcspkr-device-and-driver-separation-fix-3.patch
git-kbuild.patch
git-libata-all.patch
m25p80-printk-warning-fix.patch
git-netdev-all.patch
ipw2200-warning-fix.patch
drivers-net-ns83820c-add-paramter-to-disable-auto-tidy.patch
3c509-bus-registration-fix.patch
3c509-use-proper-suspend-resume-api-fix.patch
pm-suspend-eisa-and-mca-devices-fix.patch
git-net-vs-remove-module_parm.patch
net-allow-32-bit-socket-ioctl-in-64-bit-kernel-tidy.patch
net-socket-timestamp-32-bit-handler-for-64-bit-kernel-tidy.patch
net-socket-timestamp-32-bit-handler-for-64-bit-kernel-fix.patch
x25-ioctl-conversion-32-bit-user-to-64-bit-kernel-tidy.patch
x25-ioctl-conversion-32-bit-user-to-64-bit-kernel-tidy-fix.patch
x25-allow-itu-t-dte-facilities-for-x25-tidy.patch
nfs-apply-mount-root-dentry-override-to-filesystems-v9fs-fix.patch
nfs-unify-nfs-superblocks-per-protocol-per-server-fix.patch
revert-gregkh-pci-x86-pci-domain-support-the-meat.patch
git-pcmcia.patch
git-scsi-misc.patch
megaraid-unused-variable.patch
git-sas-jg.patch
git-sparc64.patch
gregkh-usb-usb-optimise-devio.c-usbdev_read-fix.patch
gregkh-usb-usbfs2-vs-nfs-apply-mount-root-dentry-override-to-filesystems.patch
git-watchdog.patch
x86_64-mm-dmi-year-fix.patch
revert-x86_64-mm-dmi-early.patch
x86_64-mm-c3-timer-check-amd-fix.patch
git-xfs.patch
drivers-block-floppyc-dont-free_irq-from-irq-context-fix.patch
slab-cleanup.patch
slab-remove-slab_no_reap-option-fix.patch
on_each_cpu-disable-local-interupts.patch
slab-use-on_each_cpu.patch
vmscan-scan_control-cleanup.patch
vmscan-use-unsigned-longs.patch
vmscan-return-nr_reclaimed.patch
vmscan-rename-functions.patch
mm-prep_zero_page-in-irq-is-a-bug.patch
hugepage-small-fixes-to-hugepage-clear-copy-path-tidy.patch
hugepage-serialize-hugepage-allocation-and-instantiation-tidy.patch
mm-implement-swap-prefetching-fix.patch
acx1xx-wireless-driver.patch
via-pmu-warning-fix.patch
x86-early-printk-remove-max_ypos-and-max_xpos-macros.patch
register-the-boot-cpu-in-the-cpu-maps-earlier-fix.patch
i386-actively-synchronize-vmalloc-area-when-registering-certain-callbacks-tidy.patch
fix-the-imlicit-declaration-of-mtrr_centaur_report_mcr-in-arch-i386-kernel-cpu-centaurc-fix.patch
revert-swsusp-fix-breakage-with-swap-on-lvm.patch
pm-print-name-of-failed-suspend-function.patch
swsusp-resume-parsing-fix.patch
ext3_readdir-use-generic-readahead.patch
sem2mutex-blockdev-2-git-blktrace-fix.patch
pause_on_oops-command-line-option.patch
more-for_each_cpu-conversions.patch
free_uid-locking-improvement.patch
percpu_counter_sum.patch
filemap_fdata_write-api-fix-end-parameter.patch
fadvise-async-write-commands.patch
balance_dirty_pages_ratelimited-take-nr_pages-arg.patch
set_page_dirty-return-value-fixes.patch
msync-perform-dirty-page-levelling.patch
msync-ms_sync-dont-hold-mmap_sem-while-syncing.patch
msync-fix-return-value.patch
fsync-extract-internal-code.patch
msync-use-do_fsync.patch
sys_setrlimit-cleanup.patch
rlimit_cpu-fix-handling-of-a-zero-limit.patch
rlimit_cpu-document-wrong-return-value.patch
fix-file-counting-fixes.patch
jbd-embed-j_commit_timer-in-journal-struct.patch
jbd-convert-kjournald-to-kthread-api.patch
hysdn-remove-custom-types.patch
remove-module_parm-fix.patch
sysrq-cleanup.patch
initcall-failure-reporting.patch
3c59x-use-mii_check_media-tidy.patch
permit-dual-mit-gpl-licenses.patch
2tb-files-add-blkcnt_t-fixes.patch
ext3-get-blocks-maping-multiple-blocks-at-a-once-vs-ext3_readdir-use-generic-readahead.patch
pass-b_size-to-get_block-speedup.patch
pass-b_size-to-get_block-remove-unneeded-assignments.patch
map-multiple-blocks-for-mpage_readpages-tidy.patch
time-clocksource-infrastructure-remove-nsec_t.patch
time-generic-timekeeping-infrastructure-remove-nsec_t.patch
time-fix-cpu-frequency-detection.patch
kretprobe-instance-recycled-by-parent-process-tidy.patch
kretprobe-instance-recycled-by-parent-process-fix.patch
edac-switch-to-kthread_-api-tidy.patch
cmpci-dont-use-generig_hweight32.patch
unify-pfn_to_page-sparc64-pfn_to_page-fix.patch
uninline-zone-helpers-fix.patch
uninline-zone-helpers-prefetch-fix.patch
lightweight-robust-futexes-arch-defaults-fix.patch
rtc-subsystem-class-fix.patch
rtc-subsystem-class-fix-2.patch
proc-dont-lock-task_structs-indefinitely-git-nfs-fix.patch
proc-use-sane-permission-checks-on-the-proc-pid-fd-fix.patch
reiser4-only.patch
reiser4-only-stop-using-__put_page.patch
reiser4-swsusp-build-fix.patch
reiser4-printk-warning-fix.patch
reiser4-mm-remove-pg_highmem-fix.patch
reiser4-big-update-bug-fix-for-readpage-fix.patch
reiser4-big-update-rename-print_address.patch
reiser4-page-private-fixes.patch
reiser4-big-update-div64-fix.patch
reiser4-remove-c99isms.patch
reiser4_releasepage-gfp_t-fixes.patch
reiser4-big-update-update_atime-fixes.patch
reiser4-vs-nfs-apply-mount-root-dentry-override-to-filesystems.patch
ide_generic_all_on-warning-fix.patch
fbdev-framebuffer-driver-for-geode-gx-warning-fix.patch
dm-remove-sector_format.patch
ia64-const-f_ops-fix.patch
kgdb-ga-remove-stuff.patch
kgdb-remove-NO_CPUS.patch
kgdb-remove-KGDB_TS.patch
kgdb-remove-STACK_OVERFLOW_TEST.patch
kgdb-remove-TRAP_BAD_SYSCALL_EXITS.patch
kgdb-always-KGDB_CONSOLE.patch
kgdb-remove-CONFIG_KGDB_USER_CONSOLE.patch
kgdb-serial-cleanup.patch
kgdb-serial-cleanup-2.patch
kgdb-serial-cleanup-3.patch
kgdb-nmi-cleanup.patch
kgdb-cleanup-version.patch
kgdb-cleanup-includes.patch
kgdb-remove-KGDB_SYSRQ.patch
kgdb-rename-breakpoint.patch
kgdb-convert-for-cpu-helpers.patch
kgdb-select-debug_info.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
git-audit-master-build-fix.patch