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

Commit 6b3d2cc4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: vt6655: fix buffer overflow
  Revert: "Staging: batman-adv: Adding netfilter-bridge hooks"
parents 0c4ab345 dd173abf

drivers/staging/batman-adv/hard-interface.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "hash.h"

#include "hash.h"





#include <linux/if_arp.h>

#include <linux/if_arp.h>

#include <linux/netfilter_bridge.h>





#define MIN(x, y) ((x) < (y) ? (x) : (y))

#define MIN(x, y) ((x) < (y) ? (x) : (y))
@@ -431,11 +430,6 @@ static int hard_if_event(struct notifier_block *this, 
	return NOTIFY_DONE;

	return NOTIFY_DONE;

}

}





static int batman_skb_recv_finish(struct sk_buff *skb)

{

	return NF_ACCEPT;

}



/* receive a packet with the batman ethertype coming on a hard

/* receive a packet with the batman ethertype coming on a hard

 * interface */

 * interface */

int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,

int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
@@ -456,13 +450,6 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, 
	if (atomic_read(&module_state) != MODULE_ACTIVE)

	if (atomic_read(&module_state) != MODULE_ACTIVE)

		goto err_free;

		goto err_free;





	/* if netfilter/ebtables wants to block incoming batman

	 * packets then give them a chance to do so here */

	ret = NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, dev, NULL,

		      batman_skb_recv_finish);

	if (ret != 1)

		goto err_out;



	/* packet should hold at least type and version */

	/* packet should hold at least type and version */

	if (unlikely(skb_headlen(skb) < 2))

	if (unlikely(skb_headlen(skb) < 2))

		goto err_free;

		goto err_free;

drivers/staging/batman-adv/send.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "vis.h"

#include "vis.h"

#include "aggregation.h"

#include "aggregation.h"





#include <linux/netfilter_bridge.h>





static void send_outstanding_bcast_packet(struct work_struct *work);

static void send_outstanding_bcast_packet(struct work_struct *work);
@@ -92,12 +91,9 @@ int send_skb_packet(struct sk_buff *skb, 




	/* dev_queue_xmit() returns a negative result on error.	 However on

	/* dev_queue_xmit() returns a negative result on error.	 However on

	 * congestion and traffic shaping, it drops and returns NET_XMIT_DROP

	 * congestion and traffic shaping, it drops and returns NET_XMIT_DROP

	 * (which is > 0). This will not be treated as an error.

	 * (which is > 0). This will not be treated as an error. */

	 * Also, if netfilter/ebtables wants to block outgoing batman

	 * packets then giving them a chance to do so here */





	return NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,

	return dev_queue_xmit(skb);

		       dev_queue_xmit);

send_skb_err:

send_skb_err:

	kfree_skb(skb);

	kfree_skb(skb);

	return NET_XMIT_DROP;

	return NET_XMIT_DROP;

drivers/staging/vt6655/wpactl.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -766,9 +766,14 @@ static int wpa_set_associate(PSDevice pDevice, 
    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_ie_len = %d\n", param->u.wpa_associate.wpa_ie_len);

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_ie_len = %d\n", param->u.wpa_associate.wpa_ie_len);









	if (param->u.wpa_associate.wpa_ie &&

	if (param->u.wpa_associate.wpa_ie_len) {

	    copy_from_user(&abyWPAIE[0], param->u.wpa_associate.wpa_ie, param->u.wpa_associate.wpa_ie_len))

		if (!param->u.wpa_associate.wpa_ie)

			return -EINVAL;

			return -EINVAL;

		if (param->u.wpa_associate.wpa_ie_len > sizeof(abyWPAIE))

			return -EINVAL;

		if (copy_from_user(&abyWPAIE[0], param->u.wpa_associate.wpa_ie, param->u.wpa_associate.wpa_ie_len))

			return -EFAULT;

	}





	if (param->u.wpa_associate.mode == 1)

	if (param->u.wpa_associate.mode == 1)

	    pMgmt->eConfigMode = WMAC_CONFIG_IBSS_STA;

	    pMgmt->eConfigMode = WMAC_CONFIG_IBSS_STA;