Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=add3f2fa7a6cec16d35a95b9078e1ecc80a6f332
Commit:     add3f2fa7a6cec16d35a95b9078e1ecc80a6f332
Parent:     d81ef0fb76ef2eb7126f64cb34217d2ddfb48483
Author:     Ursula Braun <[EMAIL PROTECTED]>
AuthorDate: Wed Jun 20 12:58:02 2007 +0200
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Wed Jun 20 19:12:42 2007 -0400

    s390: avoid inconsistent lock state in qeth
    
    ipv6_regen_rndid in net/ipv6/addrconf.c makes use of "write_lock_bh"
    for its inet6_dev->lock. It may run in softirq-context.
    qeth makes use of "read_lock" for the same inet6_dev->lock.
    To avoid a potential deadlock situation, qeth should make use of
    "read_lock_bh" for its usages of inet6_dev->lock.
    
    Signed-off-by: Ursula Braun <[EMAIL PROTECTED]>
    Signed-off-by: Frank Pavlic <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/s390/net/qeth_main.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index c5a9507..79b7379 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -5850,9 +5850,9 @@ qeth_add_vlan_mc6(struct qeth_card *card)
                in_dev = in6_dev_get(netdev);
                if (!in_dev)
                        continue;
-               read_lock(&in_dev->lock);
+               read_lock_bh(&in_dev->lock);
                qeth_add_mc6(card,in_dev);
-               read_unlock(&in_dev->lock);
+               read_unlock_bh(&in_dev->lock);
                in6_dev_put(in_dev);
        }
 #endif /* CONFIG_QETH_VLAN */
@@ -5869,10 +5869,10 @@ qeth_add_multicast_ipv6(struct qeth_card *card)
        in6_dev = in6_dev_get(card->dev);
        if (in6_dev == NULL)
                return;
-       read_lock(&in6_dev->lock);
+       read_lock_bh(&in6_dev->lock);
        qeth_add_mc6(card, in6_dev);
        qeth_add_vlan_mc6(card);
-       read_unlock(&in6_dev->lock);
+       read_unlock_bh(&in6_dev->lock);
        in6_dev_put(in6_dev);
 }
 #endif /* CONFIG_QETH_IPV6 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to