From: Tom Leete <tleete@mountain.net>
To: "David S. Miller" <davem@redhat.com>
Cc: linux-kernel@vger.kernel.org, netdev <netdev@oss.sgi.com>
Subject: [PATCH] ipv4 skbuff locking scope
Date: Mon, 30 Oct 2000 17:24:24 -0500 [thread overview]
Message-ID: <39FDF518.A9F1204D@mountain.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
Hello,
This fixes tests of a socket buffer done without holding the
lock. tcp_data_wait() and wait_for_tcp_memory() both had
unguarded refs in their sleep conditionals.
Tom
[-- Attachment #2: tcp.lock.scope.patch --]
[-- Type: text/plain, Size: 1387 bytes --]
--- linux-2.4.0-test10-pre5/net/ipv4/tcp.c~ Sun Oct 29 01:21:09 2000
+++ linux/net/ipv4/tcp.c Mon Oct 30 16:53:19 2000
@@ -204,6 +204,9 @@
* Andi Kleen : Make poll agree with SIGIO
* Salvatore Sanfilippo : Support SO_LINGER with linger == 1 and
* lingertime == 0 (RFC 793 ABORT Call)
+ * Tom Leete : Fix locking scope in
+ * wait_for_tcp_memory, tcp_data_wait
+ *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -871,10 +874,11 @@
break;
if (sk->err)
break;
- release_sock(sk);
- if (!tcp_memory_free(sk) || vm_wait)
+ if (!tcp_memory_free(sk) || vm_wait) {
+ release_sock(sk);
current_timeo = schedule_timeout(current_timeo);
- lock_sock(sk);
+ lock_sock(sk);
+ }
if (vm_wait) {
if (timeo != MAX_SCHEDULE_TIMEOUT &&
(timeo -= vm_wait-current_timeo) < 0)
@@ -1273,12 +1277,12 @@
__set_current_state(TASK_INTERRUPTIBLE);
set_bit(SOCK_ASYNC_WAITDATA, &sk->socket->flags);
- release_sock(sk);
- if (skb_queue_empty(&sk->receive_queue))
+ if (skb_queue_empty(&sk->receive_queue)){
+ release_sock(sk);
timeo = schedule_timeout(timeo);
-
- lock_sock(sk);
+ lock_sock(sk);
+ }
clear_bit(SOCK_ASYNC_WAITDATA, &sk->socket->flags);
remove_wait_queue(sk->sleep, &wait);
next reply other threads:[~2000-10-30 22:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2000-10-30 22:24 Tom Leete [this message]
2000-10-30 22:24 ` [PATCH] ipv4 skbuff locking scope David S. Miller
2000-10-31 2:41 ` Horst von Brand
2000-10-31 3:18 ` Tom Leete
2000-10-31 4:03 ` David S. Miller
2000-10-31 4:38 ` Albert D. Cahalan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=39FDF518.A9F1204D@mountain.net \
--to=tleete@mountain.net \
--cc=davem@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).