linux-kernel - [PATCH] rt/workqueue: fix an early crash and some warnings

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <49444A44.3030206@gmail.com>
Date:	Sun, 14 Dec 2008 00:50:28 +0100
From:	Frederic Weisbecker <fweisbec@...il.com>
To:	Steven Rostedt <rostedt@...dmis.org>
CC:	Peter Zijlstra <peterz@...radead.org>,
	Linux Kernel <linux-kernel@...r.kernel.org>,
	Gregory Haskins <ghaskins@...ell.com>,
	Ingo Molnar <mingo@...e.hu>
Subject: [PATCH] rt/workqueue: fix an early crash and some warnings

Impact: fix early crash and build warnings

While building the broken/rt/workqueue topic, I got various warnings:

kernel/workqueue.c: In function ‘delayed_work_timer_fn’:
kernel/workqueue.c:214: attention : passing argument 3 of ‘__queue_work’ makes integer from pointer without a cast

This one is the cause of an early crash: the adress of the priority is passed instead of its
value, hence the following BUG_ON() triggering on sched.c:rt_mutex_setprio()

BUG_ON(prio < 0 || prio > MAX_PRIO)

Various warnings are displayed because of confusion between common linked-list and priority
sorted linked-list:

kernel/workqueue.c: In function ‘flush_work’:
kernel/workqueue.c:527: attention : passing argument 1 of ‘list_empty’ from incompatible pointer type
kernel/workqueue.c:535: attention : assignment from incompatible pointer type
kernel/workqueue.c:539: attention : assignment from incompatible pointer type

This patch fixes them (hopefully correctly).

broken/rt/workqueue boots correctly now.

Signed-off-by: Frederic Weisbecker <fweisbec@...il.com>
---
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index f0c32ff..b704c40 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -211,7 +211,7 @@ static void delayed_work_timer_fn(unsigned long __data)
 	struct workqueue_struct *wq = cwq->wq;
 
 	__queue_work(wq_per_cpu(wq, smp_processor_id()),
-		     &dwork->work, &dwork->prio);
+		     &dwork->work, dwork->prio);
 }
 
 /**
@@ -511,7 +511,7 @@ EXPORT_SYMBOL_GPL(flush_workqueue);
 int flush_work(struct work_struct *work)
 {
 	struct cpu_workqueue_struct *cwq;
-	struct list_head *prev;
+	struct plist_head *prev;
 	struct wq_barrier barr;
 
 	might_sleep();
@@ -524,7 +524,7 @@ int flush_work(struct work_struct *work)
 
 	prev = NULL;
 	spin_lock_irq(&cwq->lock);
-	if (!list_empty(&work->entry)) {
+	if (!plist_node_empty(&work->entry)) {
 		/*
 		 * See the comment near try_to_grab_pending()->smp_rmb().
 		 * If it was re-queued under us we are not going to wait.
@@ -532,7 +532,7 @@ int flush_work(struct work_struct *work)
 		smp_rmb();
 		if (unlikely(cwq != get_wq_data(work)))
 			goto out;
-		prev = &work->entry;
+		prev = &work->entry.plist;
 	} else {
 		if (cwq->current_work != work)
 			goto out;
-- 
1.6.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/