From: Krzysztof Mazur <krzysiek@podlesie.net>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>,
David Woodhouse <David.Woodhouse@intel.com>,
davem@davemloft.net, Krzysztof Mazur <krzysiek@podlesie.net>
Subject: [PATCH v3 6/7] pppoatm: don't send frames on not-ready vcc
Date: Tue, 6 Nov 2012 23:17:01 +0100 [thread overview]
Message-ID: <1352240222-363-7-git-send-email-krzysiek@podlesie.net> (raw)
In-Reply-To: <1352240222-363-1-git-send-email-krzysiek@podlesie.net>
Patches "atm: detach protocol before closing vcc"
and "pppoatm: allow assign only on a connected socket" fixed
common cases where the pppoatm_send() crashes while sending
frame to not-ready vcc. However there are still some other cases
where we can send frames to vcc, which is flagged as ATM_VF_CLOSE
(for instance after vcc_release_async()) or it's opened but not
ready yet.
Now pppoatm_send(), like vcc_sendmsg(), checks for vcc flags that
indicate that vcc is not ready.
Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
Cc: David Woodhouse <David.Woodhouse@intel.com>
---
net/atm/pppoatm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index c4a57bc..bf5d6c9 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -284,6 +284,10 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
bh_lock_sock(sk_atm(vcc));
if (sock_owned_by_user(sk_atm(vcc)))
goto nospace;
+ if (test_bit(ATM_VF_RELEASED, &vcc->flags)
+ || test_bit(ATM_VF_CLOSE, &vcc->flags)
+ || !test_bit(ATM_VF_READY, &vcc->flags))
+ goto nospace;
switch (pvcc->encaps) { /* LLC encapsulation needed */
case e_llc:
--
1.8.0.233.g54991f2
next prev parent reply other threads:[~2012-11-06 22:20 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-06 22:16 [PATCH v3 0/7] pppoatm: fix multiple issues with pppoatm driver Krzysztof Mazur
2012-11-06 22:16 ` [PATCH v3 1/7] atm: detach protocol before closing vcc Krzysztof Mazur
2012-11-06 22:16 ` [PATCH v3 2/7] atm: add owner of push() callback to atmvcc Krzysztof Mazur
2012-11-07 19:05 ` chas williams - CONTRACTOR
2012-11-06 22:16 ` [PATCH v3 3/7] pppoatm: allow assign only on a connected socket Krzysztof Mazur
2012-11-06 22:16 ` [PATCH v3 4/7] pppoatm: fix module_put() race Krzysztof Mazur
2012-11-06 22:17 ` [PATCH v3 5/7] pppoatm: take ATM socket lock in pppoatm_send() Krzysztof Mazur
2012-11-06 22:57 ` Woodhouse, David
2012-11-06 22:17 ` Krzysztof Mazur [this message]
2012-11-06 22:17 ` [PATCH v3 7/7] pppoatm: do not inline pppoatm_may_send() Krzysztof Mazur
2012-11-07 12:52 ` [PATCH v3 8/7] pppoatm: fix missing wakeup in pppoatm_send() David Woodhouse
2012-11-09 21:30 ` David Miller
2012-11-10 7:36 ` David Woodhouse
2012-11-10 18:38 ` David Miller
2012-11-10 20:23 ` Krzysztof Mazur
2012-11-10 21:02 ` David Woodhouse
2012-11-10 22:33 ` Krzysztof Mazur
2012-11-11 7:28 ` David Woodhouse
2012-11-11 11:04 ` Krzysztof Mazur
2012-11-11 11:39 ` David Woodhouse
2012-11-11 13:50 ` Krzysztof Mazur
2012-11-11 15:26 ` David Woodhouse
2012-11-11 16:12 ` Krzysztof Mazur
2012-11-11 17:03 ` David Woodhouse
2012-11-11 18:49 ` Krzysztof Mazur
2012-11-11 20:51 ` David Woodhouse
2012-11-11 22:57 ` Chas Williams (CONTRACTOR)
2012-11-27 13:27 ` David Woodhouse
2012-11-27 15:23 ` chas williams - CONTRACTOR
2012-11-28 0:48 ` David Woodhouse
2012-11-28 8:12 ` Krzysztof Mazur
2012-11-28 9:24 ` David Woodhouse
2012-11-28 9:58 ` Krzysztof Mazur
2012-11-28 10:19 ` David Woodhouse
2012-11-11 22:47 ` Chas Williams (CONTRACTOR)
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=1352240222-363-7-git-send-email-krzysiek@podlesie.net \
--to=krzysiek@podlesie.net \
--cc=David.Woodhouse@intel.com \
--cc=chas@cmf.nrl.navy.mil \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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).