Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe397d46 authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

[PATCH] orinoco: fix setting transmit key only 



When determining whether there's a key to set or not, orinoco should be
looking at the key length, not the key data.  Otherwise confusion reigns
when trying to set TX key only, passing in zero-length key, but non-NULL
pointer.  Key length takes precedence over non-NULL key data.

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 345f6b8b

drivers/net/wireless/orinoco.c

+2 −2
Original line number Diff line number Diff line
@@ -2875,7 +2875,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, 
	if (orinoco_lock(priv, &flags) != 0)

		return -EBUSY;



	if (erq->pointer) {

	if (erq->length > 0) {

		if ((index < 0) || (index >= ORINOCO_MAX_KEYS))

			index = priv->tx_key;
@@ -2918,7 +2918,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, 
	if (erq->flags & IW_ENCODE_RESTRICTED)

		restricted = 1;



	if (erq->pointer) {

	if (erq->pointer && erq->length > 0) {

		priv->keys[index].len = cpu_to_le16(xlen);

		memset(priv->keys[index].data, 0,

		       sizeof(priv->keys[index].data));