diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-02-26 13:04:51 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-06 16:25:47 -0500 |
| commit | 2dcc26e37c55b9db2f3a0ea6e4b931e37ca286d2 (patch) | |
| tree | b0f8f602260e4fdf03345fcc0fd25fa183d7d121 | |
| parent | 88cceab541f066b7f5d56a6d2da9ae2be4c3bb6c (diff) | |
ray_cs: read past the end of the array
"translate" should either be set or disabled. We also use it an
offset into the framing[] array when we're generating the proc
file. Framing looks like this:
static const char *framing[] = { "Encapsulation", "Translation" }
So when we're setting translate we need to restrict the values to
either 1 or 0 or it can an out of bounds read.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ray_cs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 3109c0db66e..4775b5d172d 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -144,7 +144,7 @@ static int psm; static char *essid; /* Default to encapsulation unless translation requested */ -static int translate = 1; +static bool translate = 1; static int country = USA; @@ -178,7 +178,7 @@ module_param(hop_dwell, int, 0); module_param(beacon_period, int, 0); module_param(psm, int, 0); module_param(essid, charp, 0); -module_param(translate, int, 0); +module_param(translate, bool, 0); module_param(country, int, 0); module_param(sniffer, int, 0); module_param(bc, int, 0); @@ -1353,7 +1353,7 @@ static int ray_get_range(struct net_device *dev, struct iw_request_info *info, static int ray_set_framing(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - translate = *(extra); /* Set framing mode */ + translate = !!*(extra); /* Set framing mode */ return 0; } |