Re: git pull
Jens Kasten <[email protected]> Wed, 08 Aug 2012 21:23:20 +0200
| Newsgroups | gmane.linux.rsbac |
|---|---|
| Message-ID | <1344453800.15487.2.camel@jaschtschik-pc> |
Hi, this I had to do, see attachment. Now I can compile the kernel. Am Samstag, den 04.08.2012, 15:49 +0200 schrieb Jens Kasten: > When I try to build now kernel i get: > > fs/open.c: In function ‘sys_fchdir’: > fs/open.c:548: error: redeclaration of ‘rsbac_target_id’ with no > linkage > fs/open.c:543: note: previous declaration of ‘rsbac_target_id’ was here > fs/open.c:549: error: redeclaration of ‘rsbac_attribute_value’ with no > linkage > fs/open.c:544: note: previous declaration of ‘rsbac_attribute_value’ > was here > make[2]: *** [fs/open.o] Fehler 1 > > Its the latest git linux-3.4.y (3.4.7) > > > Am 2012-08-04 10:51, schrieb Jens Kasten: > > hi list, > > > > Somehow when I do a pull to update the kernel archive i get: > > > > Auto-merging rsbac/data_structures/aci_ata_structures.c > > CONFLICT (add/add): Merge conflict in > > rsbac/data_structures/aci_data_structures.c > > Automatic merge failed; fix conflicts and then commit the result. > > > > Its not the first time that update the master branch failed. > > -- > Mit freundlichen Grüßen > > Jens Kasten > > > http://www.kasten-edv.de > E-bikes: http://www.remsdale.de > _______________________________________________ > rsbac mailing list > [email protected] > http://www.rsbac.org/mailman/listinfo/rsbac _______________________________________________ rsbac mailing list [email protected] http://www.rsbac.org/mailman/listinfo/rsbac
patch_3.2.25-rsbac-merge-fix.diff
(text/x-patch, 12 KB)
diff --git a/fs/open.c b/fs/open.c
index 52ddaf2..d2f0785 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -544,11 +544,6 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
union rsbac_attribute_value_t rsbac_attribute_value;
#endif
-#ifdef CONFIG_RSBAC
- union rsbac_target_id_t rsbac_target_id;
- union rsbac_attribute_value_t rsbac_attribute_value;
-#endif
-
error = -EBADF;
file = fget_raw_light(fd, &fput_needed);
if (!file)
diff --git a/fs/pipe.c b/fs/pipe.c
index 12cb724..ec80485 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -391,16 +391,7 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
T_IPC,
rsbac_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
return -EPERM;
}
#endif
@@ -516,16 +507,7 @@ redo:
T_NONE,
rsbac_new_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
- rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
rsbac_printk(KERN_WARNING
"pipe_readv(): rsbac_adf_set_attr() returned error\n");
}
@@ -575,16 +557,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
T_IPC,
rsbac_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
return -EPERM;
}
#endif
@@ -757,16 +730,7 @@ out:
T_NONE,
rsbac_new_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
- rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
rsbac_printk(KERN_WARNING
"pipe_writev(): rsbac_adf_set_attr() returned error\n");
}
@@ -867,15 +831,7 @@ pipe_release(struct inode *inode, int decr, int decw)
#ifdef CONFIG_RSBAC
rsbac_pr_debug(aef, "calling ACI remove_target()\n");
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_target_id.ipc.type = I_anonpipe;
-=======
rsbac_target_id.ipc.type = I_anonpipe;
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- rsbac_target_id.ipc.type = I_anonpipe;
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
rsbac_target_id.ipc.id.id_nr = inode->i_ino;
rsbac_remove_target(T_IPC, rsbac_target_id);
#endif
@@ -913,16 +869,7 @@ pipe_read_fasync(int fd, struct file *filp, int on)
T_IPC,
rsbac_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
- rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
return -EPERM;
}
#endif
@@ -934,31 +881,14 @@ pipe_read_fasync(int fd, struct file *filp, int on)
#ifdef CONFIG_RSBAC_RW
rsbac_new_target_id.dummy = 0;
-<<<<<<< HEAD
-<<<<<<< HEAD
- if (rsbac_adf_set_attr(R_READ,
-=======
if ((retval >= 0) && rsbac_adf_set_attr(R_READ,
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- if ((retval >= 0) && rsbac_adf_set_attr(R_READ,
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
task_pid(current),
T_IPC,
rsbac_target_id,
T_NONE,
rsbac_new_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
- rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
rsbac_printk(KERN_WARNING "pipe_read_fasync(): rsbac_adf_set_attr() returned error\n");
}
#endif
@@ -990,16 +920,7 @@ pipe_write_fasync(int fd, struct file *filp, int on)
T_IPC,
rsbac_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
return -EPERM;
}
#endif
@@ -1011,31 +932,14 @@ pipe_write_fasync(int fd, struct file *filp, int on)
#ifdef CONFIG_RSBAC_RW
rsbac_new_target_id.dummy = 0;
-<<<<<<< HEAD
-<<<<<<< HEAD
- if (rsbac_adf_set_attr(R_WRITE,
-=======
- if ((retval >= 0) && rsbac_adf_set_attr(R_WRITE,
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
if ((retval >= 0) && rsbac_adf_set_attr(R_WRITE,
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
task_pid(current),
T_IPC,
rsbac_target_id,
T_NONE,
rsbac_new_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
rsbac_printk(KERN_WARNING "pipe_write_fasync(): rsbac_adf_set_attr() returned error\n");
}
#endif
@@ -1068,16 +972,7 @@ pipe_rdwr_fasync(int fd, struct file *filp, int on)
T_IPC,
rsbac_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
- rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
return -EPERM;
}
@@ -1091,16 +986,7 @@ pipe_rdwr_fasync(int fd, struct file *filp, int on)
T_IPC,
rsbac_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
return -EPERM;
}
#endif
@@ -1114,41 +1000,7 @@ pipe_rdwr_fasync(int fd, struct file *filp, int on)
fasync_helper(-1, filp, 0, &pipe->fasync_readers);
}
mutex_unlock(&inode->i_mutex);
-<<<<<<< HEAD
-<<<<<<< HEAD
-#ifdef CONFIG_RSBAC_RW
- rsbac_new_target_id.dummy = 0;
- if (rsbac_adf_set_attr(R_READ,
- task_pid(current),
- T_IPC,
- rsbac_target_id,
- T_NONE,
- rsbac_new_target_id,
- A_none,
- rsbac_attribute_value))
- {
- rsbac_printk(KERN_WARNING
- "pipe_rwdr_fasync(): rsbac_adf_set_attr() returned error\n");
- }
-
- /* RSBAC: notify adf of write to pipe */
- rsbac_new_target_id.dummy = 0;
-
- if (rsbac_adf_set_attr(R_WRITE,
- task_pid(current),
- T_IPC,
- rsbac_target_id,
- T_NONE,
- rsbac_new_target_id,
- A_none,
- rsbac_attribute_value))
- {
- rsbac_printk(KERN_WARNING
- "pipe_rwdr_fasync(): rsbac_adf_set_attr() returned error\n");
-=======
-=======
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
#ifdef CONFIG_RSBAC_RW
if (retval >= 0) {
@@ -1176,10 +1028,6 @@ pipe_rdwr_fasync(int fd, struct file *filp, int on)
rsbac_printk(KERN_WARNING
"pipe_rwdr_fasync(): rsbac_adf_set_attr() for WRITE returned error\n");
}
-<<<<<<< HEAD
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
}
#endif
@@ -1231,16 +1079,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
T_IPC,
rsbac_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
return -EPERM;
}
#endif
@@ -1257,31 +1096,14 @@ pipe_read_open(struct inode *inode, struct file *filp)
#ifdef CONFIG_RSBAC
rsbac_new_target_id.dummy = 0;
-<<<<<<< HEAD
-<<<<<<< HEAD
- if (rsbac_adf_set_attr(R_READ_OPEN,
-=======
- if (!ret && rsbac_adf_set_attr(R_READ_OPEN,
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
if (!ret && rsbac_adf_set_attr(R_READ_OPEN,
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
task_pid(current),
T_IPC,
rsbac_target_id,
T_NONE,
rsbac_new_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
- rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
rsbac_printk(KERN_WARNING "pipe_read_open(): rsbac_adf_set_attr() returned error\n");
}
#endif
@@ -1311,16 +1133,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
T_IPC,
rsbac_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
return -EPERM;
}
#endif
@@ -1337,31 +1150,14 @@ pipe_write_open(struct inode *inode, struct file *filp)
#ifdef CONFIG_RSBAC
rsbac_new_target_id.dummy = 0;
-<<<<<<< HEAD
-<<<<<<< HEAD
- if (rsbac_adf_set_attr(R_WRITE_OPEN,
-=======
- if (!ret && rsbac_adf_set_attr(R_WRITE_OPEN,
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
if (!ret && rsbac_adf_set_attr(R_WRITE_OPEN,
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
task_pid(current),
T_IPC,
rsbac_target_id,
T_NONE,
rsbac_new_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
rsbac_printk(KERN_WARNING "pipe_write_open(): rsbac_adf_set_attr() returned error\n");
}
#endif
@@ -1391,16 +1187,7 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
T_IPC,
rsbac_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
- rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
return -EPERM;
}
@@ -1422,31 +1209,14 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
/* RSBAC: notify adf of read_write_open on pipe */
rsbac_new_target_id.dummy = 0;
-<<<<<<< HEAD
-<<<<<<< HEAD
- if (rsbac_adf_set_attr(R_READ_WRITE_OPEN,
-=======
if (!ret && rsbac_adf_set_attr(R_READ_WRITE_OPEN,
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
- if (!ret && rsbac_adf_set_attr(R_READ_WRITE_OPEN,
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
task_pid(current),
T_IPC,
rsbac_target_id,
T_NONE,
rsbac_new_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
- rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
rsbac_printk(KERN_WARNING "pipe_rdwr_open(): rsbac_adf_set_attr() returned error\n");
}
#endif
@@ -1640,16 +1410,7 @@ struct file *create_write_pipe(int flags)
T_NONE,
rsbac_new_target_id,
A_none,
-<<<<<<< HEAD
-<<<<<<< HEAD
- rsbac_attribute_value))
- {
-=======
- rsbac_attribute_value)) {
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
rsbac_attribute_value)) {
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
rsbac_printk(KERN_WARNING
"do_pipe() [sys_pipe()]: rsbac_adf_set_attr() returned error");
}
@@ -1700,28 +1461,6 @@ int do_pipe_flags(int *fd, int flags)
union rsbac_attribute_value_t rsbac_attribute_value;
#endif
-<<<<<<< HEAD
-<<<<<<< HEAD
-#ifdef CONFIG_RSBAC
- rsbac_pr_debug(aef, "[sys_pipe()]: calling ADF\n");
- rsbac_target_id.ipc.type = I_anonpipe;
- rsbac_target_id.ipc.id.id_nr = 0;
- rsbac_attribute_value.dummy = 0;
- if (!rsbac_adf_request(R_CREATE,
- task_pid(current),
- T_IPC,
- rsbac_target_id,
- A_none,
- rsbac_attribute_value))
- {
- return -EPERM;
- }
-#endif
-
-=======
->>>>>>> b19f64f0ecfea7a4c31b78e973f1f5f58c0d2ccb
-=======
->>>>>>> 3e0ad438c1212db9d131139d3aca78d9c4aedebc
if (flags & ~(O_CLOEXEC | O_NONBLOCK | O_DIRECT))
return -EINVAL;