From: Chris Wright <chrisw@osdl.org>
To: davem@redhat.com
Cc: netdev@oss.sgi.com, shemminger@osdl.org
Subject: [PATCH 2/4] irda check error on memcpy_fromiovec (resend)
Date: Fri, 16 Jan 2004 14:26:14 -0800 [thread overview]
Message-ID: <20040116142614.T19023@osdlab.pdx.osdl.net> (raw)
In-Reply-To: <20040116142502.B19034@osdlab.pdx.osdl.net>; from chrisw@osdl.org on Fri, Jan 16, 2004 at 02:25:02PM -0800
Check the return value on memcpy_fromiovec().
net/irda/af_irda.c | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
===== net/irda/af_irda.c 1.49 vs edited =====
--- 1.49/net/irda/af_irda.c Fri Jan 9 02:10:53 2004
+++ edited/net/irda/af_irda.c Fri Jan 16 14:18:02 2004
@@ -1307,7 +1307,11 @@
skb_reserve(skb, self->max_header_size + 16);
asmptr = skb->h.raw = skb_put(skb, len);
- memcpy_fromiovec(asmptr, msg->msg_iov, len);
+ err = memcpy_fromiovec(asmptr, msg->msg_iov, len);
+ if (err) {
+ kfree_skb(skb);
+ return err;
+ }
/*
* Just send the message to TinyTP, and let it deal with possible
@@ -1550,7 +1554,11 @@
IRDA_DEBUG(4, "%s(), appending user data\n", __FUNCTION__);
asmptr = skb->h.raw = skb_put(skb, len);
- memcpy_fromiovec(asmptr, msg->msg_iov, len);
+ err = memcpy_fromiovec(asmptr, msg->msg_iov, len);
+ if (err) {
+ kfree_skb(skb);
+ return err;
+ }
/*
* Just send the message to TinyTP, and let it deal with possible
@@ -1613,7 +1621,11 @@
IRDA_DEBUG(4, "%s(), appending user data\n", __FUNCTION__);
asmptr = skb->h.raw = skb_put(skb, len);
- memcpy_fromiovec(asmptr, msg->msg_iov, len);
+ err = memcpy_fromiovec(asmptr, msg->msg_iov, len);
+ if (err) {
+ kfree_skb(skb);
+ return err;
+ }
err = irlmp_connless_data_request(self->lsap, skb);
if (err) {
next prev parent reply other threads:[~2004-01-16 22:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-01-16 22:25 [PATCH 1/4] ax25 check error on memcpy_fromiovec (resend) Chris Wright
2004-01-16 22:26 ` Chris Wright [this message]
2004-01-16 22:27 ` [PATCH 3/4] netrom " Chris Wright
2004-01-16 22:28 ` [PATCH 4/4] rose " Chris Wright
2004-01-20 5:15 ` David S. Miller
-- strict thread matches above, loose matches on Subject: below --
2004-01-17 1:40 [PATCH 2/4] irda " Jean Tourrilhes
2004-01-17 1:41 ` Chris Wright
2004-01-20 5:16 ` David S. Miller
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=20040116142614.T19023@osdlab.pdx.osdl.net \
--to=chrisw@osdl.org \
--cc=davem@redhat.com \
--cc=netdev@oss.sgi.com \
--cc=shemminger@osdl.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).