All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Stephen Biggs" <yrgrknmxpzlk@gawab.com>
To: kernel-janitors@vger.kernel.org
Subject: [KJ] [PATCH][RESUBMIT][6/21] drivers/isdn/i4l/* - compile warning
Date: Mon, 14 Feb 2005 22:02:52 +0000	[thread overview]
Message-ID: <42113C2C.20128.52BC5B@localhost> (raw)

[-- Attachment #1: Mail message body --]
[-- Type: text/plain, Size: 2074 bytes --]

Description: compile warning cleanup - handle copy_to/from_user error 
returns, initialize return value to reasonable number in case used before 
initialized.

Signed-off-by: Stephen Biggs <yrgrknmxpzlk@gawab.com>

diff -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm2-original/drivers/isdn/i4l/isdn_common.c linux-2.6.11-rc3-mm2/drivers/isdn/i4l/isdn_common.c
--- linux-2.6.11-rc3-mm2-original/drivers/isdn/i4l/isdn_common.c	2004-12-24 23:34:31.000000000 +0200
+++ linux-2.6.11-rc3-mm2/drivers/isdn/i4l/isdn_common.c	2005-02-12 17:01:02.000000000 +0200
@@ -1842,8 +1842,12 @@ isdn_writebuf_stub(int drvidx, int chan,
 	if (!skb)
 		return 0;
 	skb_reserve(skb, hl);
-	copy_from_user(skb_put(skb, len), buf, len);
+	if (copy_from_user(skb_put(skb, len), buf, len)) {
+		ret = -EFAULT;
+		goto after_writebuf_skb;
+	}
 	ret = dev->drv[drvidx]->interface->writebuf_skb(drvidx, chan, 1, skb);
+after_writebuf_skb:
 	if (ret <= 0)
 		dev_kfree_skb(skb);
 	if (ret > 0)
diff -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm2-original/drivers/isdn/i4l/isdn_ppp.c linux-2.6.11-rc3-mm2/drivers/isdn/i4l/isdn_ppp.c
--- linux-2.6.11-rc3-mm2-original/drivers/isdn/i4l/isdn_ppp.c	2004-12-24 23:35:01.000000000 +0200
+++ linux-2.6.11-rc3-mm2/drivers/isdn/i4l/isdn_ppp.c	2005-02-12 17:01:02.000000000 +0200
@@ -789,7 +789,8 @@ isdn_ppp_read(int min, struct file *file
 	is->first = b;
 
 	spin_unlock_irqrestore(&is->buflock, flags);
-	copy_to_user(buf, save_buf, count);
+	if (copy_to_user(buf, save_buf, count))
+		count = -EFAULT; /* make sure we free the save_buf */
 	kfree(save_buf);
 
 	return count;
diff -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm2-original/drivers/isdn/i4l/isdn_v110.c linux-2.6.11-rc3-mm2/drivers/isdn/i4l/isdn_v110.c
--- linux-2.6.11-rc3-mm2-original/drivers/isdn/i4l/isdn_v110.c	2004-12-24 23:35:49.000000000 +0200
+++ linux-2.6.11-rc3-mm2/drivers/isdn/i4l/isdn_v110.c	2005-02-12 17:01:02.000000000 +0200
@@ -520,7 +520,7 @@ isdn_v110_stat_callback(int idx, isdn_ct
 {
 	isdn_v110_stream *v = NULL;
 	int i;
-	int ret;
+	int ret = 0;
 
 	if (idx < 0)
 		return 0;




[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

                 reply	other threads:[~2005-02-14 22:02 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=42113C2C.20128.52BC5B@localhost \
    --to=yrgrknmxpzlk@gawab.com \
    --cc=kernel-janitors@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.