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

Commit d3d3cf05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [EBTABLES]: Clean up vmalloc usage in net/bridge/netfilter/ebtables.c
  [NET]: Add skb->truesize assertion checking.
  [TCP]: Account skb overhead in tcp_fragment
  [SUNGEM]: Marvell PHY suspend.
  [LLC]: Use pskb_trim_rcsum() in llc_fixup_skb().
  [NET]: sockfd_lookup_light() returns random error for -EBADFD
parents a6db522c 18bc89aa

drivers/net/sungem_phy.c

+6 −5
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int bcm5411_init(struct mii_phy* phy) 
	return 0;

}



static int bcm5411_suspend(struct mii_phy* phy)

static int generic_suspend(struct mii_phy* phy)

{

	phy_write(phy, MII_BMCR, BMCR_PDOWN);
@@ -738,7 +738,7 @@ static struct mii_phy_def bcm5401_phy_def = { 
/* Broadcom BCM 5411 */

static struct mii_phy_ops bcm5411_phy_ops = {

	.init		= bcm5411_init,

	.suspend	= bcm5411_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_forced	= bcm54xx_setup_forced,

	.poll_link	= genmii_poll_link,
@@ -757,7 +757,7 @@ static struct mii_phy_def bcm5411_phy_def = { 
/* Broadcom BCM 5421 */

static struct mii_phy_ops bcm5421_phy_ops = {

	.init		= bcm5421_init,

	.suspend	= bcm5411_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_forced	= bcm54xx_setup_forced,

	.poll_link	= genmii_poll_link,
@@ -776,7 +776,7 @@ static struct mii_phy_def bcm5421_phy_def = { 
/* Broadcom BCM 5421 built-in K2 */

static struct mii_phy_ops bcm5421k2_phy_ops = {

	.init		= bcm5421_init,

	.suspend	= bcm5411_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_forced	= bcm54xx_setup_forced,

	.poll_link	= genmii_poll_link,
@@ -795,7 +795,7 @@ static struct mii_phy_def bcm5421k2_phy_def = { 
/* Broadcom BCM 5462 built-in Vesta */

static struct mii_phy_ops bcm5462V_phy_ops = {

	.init		= bcm5421_init,

	.suspend	= bcm5411_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_forced	= bcm54xx_setup_forced,

	.poll_link	= genmii_poll_link,
@@ -816,6 +816,7 @@ static struct mii_phy_def bcm5462V_phy_def = { 
 * would be useful here) --BenH.

 */

static struct mii_phy_ops marvell_phy_ops = {

	.suspend	= generic_suspend,

	.setup_aneg	= marvell_setup_aneg,

	.setup_forced	= marvell_setup_forced,

	.poll_link	= genmii_poll_link,

include/linux/skbuff.h

+7 −0
Original line number Diff line number Diff line
@@ -344,6 +344,13 @@ extern void skb_over_panic(struct sk_buff *skb, int len, 
				     void *here);

extern void	      skb_under_panic(struct sk_buff *skb, int len,

				      void *here);

extern void	      skb_truesize_bug(struct sk_buff *skb);



static inline void skb_truesize_check(struct sk_buff *skb)

{

	if (unlikely((int)skb->truesize < sizeof(struct sk_buff) + skb->len))

		skb_truesize_bug(skb);

}



extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,

			int getfrag(void *from, char *to, int offset,

include/net/sock.h

+1 −0
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ static inline void sk_stream_set_owner_r(struct sk_buff *skb, struct sock *sk) 


static inline void sk_stream_free_skb(struct sock *sk, struct sk_buff *skb)

{

	skb_truesize_check(skb);

	sock_set_flag(sk, SOCK_QUEUE_SHRUNK);

	sk->sk_wmem_queued   -= skb->truesize;

	sk->sk_forward_alloc += skb->truesize;

net/bridge/netfilter/ebtables.c

+7 −13
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ static int translate_table(struct ebt_replace *repl, 
			return -ENOMEM;

		for_each_possible_cpu(i) {

			newinfo->chainstack[i] =

			   vmalloc(udc_cnt * sizeof(struct ebt_chainstack));

			  vmalloc(udc_cnt * sizeof(*(newinfo->chainstack[0])));

			if (!newinfo->chainstack[i]) {

				while (i)

					vfree(newinfo->chainstack[--i]);
@@ -841,8 +841,7 @@ static int translate_table(struct ebt_replace *repl, 
			}

		}



		cl_s = (struct ebt_cl_stack *)

		   vmalloc(udc_cnt * sizeof(struct ebt_cl_stack));

		cl_s = vmalloc(udc_cnt * sizeof(*cl_s));

		if (!cl_s)

			return -ENOMEM;

		i = 0; /* the i'th udc */
@@ -944,8 +943,7 @@ static int do_replace(void __user *user, unsigned int len) 


	countersize = COUNTER_OFFSET(tmp.nentries) * 

					(highest_possible_processor_id()+1);

	newinfo = (struct ebt_table_info *)

	   vmalloc(sizeof(struct ebt_table_info) + countersize);

	newinfo = vmalloc(sizeof(*newinfo) + countersize);

	if (!newinfo)

		return -ENOMEM;
@@ -967,8 +965,7 @@ static int do_replace(void __user *user, unsigned int len) 
	/* the user wants counters back

	   the check on the size is done later, when we have the lock */

	if (tmp.num_counters) {

		counterstmp = (struct ebt_counter *)

		   vmalloc(tmp.num_counters * sizeof(struct ebt_counter));

		counterstmp = vmalloc(tmp.num_counters * sizeof(*counterstmp));

		if (!counterstmp) {

			ret = -ENOMEM;

			goto free_entries;
@@ -1148,8 +1145,7 @@ int ebt_register_table(struct ebt_table *table) 


	countersize = COUNTER_OFFSET(table->table->nentries) *

					(highest_possible_processor_id()+1);

	newinfo = (struct ebt_table_info *)

	   vmalloc(sizeof(struct ebt_table_info) + countersize);

	newinfo = vmalloc(sizeof(*newinfo) + countersize);

	ret = -ENOMEM;

	if (!newinfo)

		return -ENOMEM;
@@ -1247,8 +1243,7 @@ static int update_counters(void __user *user, unsigned int len) 
	if (hlp.num_counters == 0)

		return -EINVAL;



	if ( !(tmp = (struct ebt_counter *)

	   vmalloc(hlp.num_counters * sizeof(struct ebt_counter))) ){

	if (!(tmp = vmalloc(hlp.num_counters * sizeof(*tmp)))) {

		MEMPRINT("Update_counters && nomemory\n");

		return -ENOMEM;

	}
@@ -1377,8 +1372,7 @@ static int copy_everything_to_user(struct ebt_table *t, void __user *user, 
			BUGPRINT("Num_counters wrong\n");

			return -EINVAL;

		}

		counterstmp = (struct ebt_counter *)

		   vmalloc(nentries * sizeof(struct ebt_counter));

		counterstmp = vmalloc(nentries * sizeof(*counterstmp));

		if (!counterstmp) {

			MEMPRINT("Couldn't copy counters, out of memory\n");

			return -ENOMEM;

net/core/skbuff.c

+8 −0
Original line number Diff line number Diff line
@@ -112,6 +112,14 @@ void skb_under_panic(struct sk_buff *skb, int sz, void *here) 
	BUG();

}



void skb_truesize_bug(struct sk_buff *skb)

{

	printk(KERN_ERR "SKB BUG: Invalid truesize (%u) "

	       "len=%u, sizeof(sk_buff)=%Zd\n",

	       skb->truesize, skb->len, sizeof(struct sk_buff));

}

EXPORT_SYMBOL(skb_truesize_bug);



/* 	Allocate a new skbuff. We do this ourselves so we can fill in a few

 *	'private' fields and also do memory statistics to find all the

 *	[BEEP] leaks.