Merge lp:~dannf/ubuntu/precise/open-iscsi/lp1053306 into lp:ubuntu/precise/open-iscsi

[dann frazier]

[Marc Deslauriers (mdeslaur)]

ACK on the Precise merge request. I've uploaded it to precise-proposed with a slight version number change for processing by the Ubuntu SRU team. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-11 22:31:39 +0000
+++ debian/changelog	2012-10-01 19:56:25 +0000
@@ -1,3 +1,10 @@
+open-iscsi (2.0.871-0ubuntu9.1) UNRELEASED; urgency=low
+
+  * usr/log.c: Do not use semarg in shared-mem for semop calls,
+    backport of upstream commit b95a7ca8 (LP: #1053306)
+
+ -- dann frazier <[e-mail]>  Mon, 24 Sep 2012 11:04:52 +0900
+
 open-iscsi (2.0.871-0ubuntu9) oneiric-proposed; urgency=low
 
   * Make sure the upstart job triggers ifupdown's upstart script to avoid

=== modified file 'usr/log.c'
--- usr/log.c	2011-10-11 22:31:39 +0000
+++ usr/log.c	2012-10-01 19:56:25 +0000
@@ -261,16 +261,21 @@
 static void dolog(int prio, const char *fmt, va_list ap)
 {
 	if (log_daemon) {
-		la->ops[0].sem_op = -1;
-		if (semop(la->semid, la->ops, 1) < 0) {
+		struct sembuf ops[1];
+
+		ops[0].sem_num = la->ops[0].sem_num;
+		ops[0].sem_flg = la->ops[0].sem_flg;
+
+		ops[0].sem_op = -1;
+		if (semop(la->semid, ops, 1) < 0) {
 			syslog(LOG_ERR, "semop up failed %d", errno);
 			return;
 		}
 
 		log_enqueue(prio, fmt, ap);
 
-		la->ops[0].sem_op = 1;
-		if (semop(la->semid, la->ops, 1) < 0) {
+		ops[0].sem_op = 1;
+		if (semop(la->semid, ops, 1) < 0) {
 			syslog(LOG_ERR, "semop down failed");
 			return;
 		}
@@ -345,16 +350,21 @@
 static void log_flush(void)
 {
 	int msglen;
+	struct sembuf ops[1];
+
+	ops[0].sem_num = la->ops[0].sem_num;
+	ops[0].sem_flg = la->ops[0].sem_flg;
+
 
 	while (!la->empty) {
-		la->ops[0].sem_op = -1;
-		if (semop(la->semid, la->ops, 1) < 0) {
+		ops[0].sem_op = -1;
+		if (semop(la->semid, ops, 1) < 0) {
 			syslog(LOG_ERR, "semop up failed %d", errno);
 			exit(1);
 		}
 		msglen = log_dequeue(la->buff);
-		la->ops[0].sem_op = 1;
-		if (semop(la->semid, la->ops, 1) < 0) {
+		ops[0].sem_op = 1;
+		if (semop(la->semid, ops, 1) < 0) {
 			syslog(LOG_ERR, "semop down failed");
 			exit(1);
 		}