public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dominique van den Broeck <domdevlin@free.fr>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Levente Kurusa <levex@linux.com>,
	linux-kernel@vger.kernel.org,
	Dominique van den Broeck <domdevlin@free.fr>
Subject: [PATCH v2 2/2] staging/rtl8192e: userspace ptr deref + incorrect declarations
Date: Sun,  4 May 2014 16:46:27 +0200	[thread overview]
Message-ID: <1399214787-15675-1-git-send-email-domdevlin@free.fr> (raw)

. userspace pointer dereference ;

These issues have been fixed by a concurrent patch:
. missing inclusions of needed header files (fixed by concurrent patch);
. unrequired static function declaration (confusing another *.c file).

Signed-off-by: Dominique van den Broeck <domdevlin@free.fr>
---
v1 : I submit this patch as a result for Task #16 of the Eudyptula Challenge.
v2 : Resubmitted because of a conflit with commit 5169af2309f42bb4cb0ebfefe6bf8bc888d4ce33 .
     Successfully tested against commit b5c8d48bf8f4273a9fe680bd834f991005c8ab59 .
     I resubmit only the 2/2 one, since the 1/2 as already been accepted.

     Levente, still agree with you about numeric values that should be changed into symbols.
     This will form another future patch.

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 498995d..d87cdfa 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -1131,11 +1131,18 @@ static int r8192_wx_set_PromiscuousMode(struct net_device *dev,
 	struct r8192_priv *priv = rtllib_priv(dev);
 	struct rtllib_device *ieee = priv->rtllib;
 
-	u32 *info_buf = (u32 *)(wrqu->data.pointer);
+	u32 info_buf[3];
 
-	u32 oid = info_buf[0];
-	u32 bPromiscuousOn = info_buf[1];
-	u32 bFilterSourceStationFrame = info_buf[2];
+	u32 oid;
+	u32 bPromiscuousOn;
+	u32 bFilterSourceStationFrame;
+
+	if (copy_from_user(info_buf, wrqu->data.pointer, sizeof(info_buf)))
+		return -EFAULT;
+
+	oid = info_buf[0];
+	bPromiscuousOn = info_buf[1];
+	bFilterSourceStationFrame = info_buf[2];
 
 	if (OID_RT_INTEL_PROMISCUOUS_MODE == oid) {
 		ieee->IntelPromiscuousModeInfo.bPromiscuousOn =

             reply	other threads:[~2014-05-04 14:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-04 14:46 Dominique van den Broeck [this message]
2014-05-04 17:48 ` [PATCH v2 2/2] staging/rtl8192e: userspace ptr deref + incorrect declarations Levente Kurusa
2014-05-04 23:59   ` Dominique van den Broeck
2014-05-05  8:29     ` Levente Kurusa

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=1399214787-15675-1-git-send-email-domdevlin@free.fr \
    --to=domdevlin@free.fr \
    --cc=gregkh@linuxfoundation.org \
    --cc=levex@linux.com \
    --cc=linux-kernel@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