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

Commit 13c926e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IRDA] irda_nl_get_mode: always results in failure
  [PPP]: Fix output buffer size in ppp_decompress_frame().
  [IRDA]: Avoid a label defined but not used warning in irda_init()
  [IPV6]: Fix kernel panic while send SCTP data with IP fragments
  [SNAP]: Check packet length before reading
  [DCCP]: Allocation in atomic context
parents 53ce2dc2 22117ea4

drivers/net/ppp_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -1726,7 +1726,7 @@ ppp_decompress_frame(struct ppp *ppp, struct sk_buff *skb) 
		}

		/* the decompressor still expects the A/C bytes in the hdr */

		len = ppp->rcomp->decompress(ppp->rc_state, skb->data - 2,

				skb->len + 2, ns->data, ppp->mru + PPP_HDRLEN);

				skb->len + 2, ns->data, obuff_size);

		if (len < 0) {

			/* Pass the compressed frame to pppd as an

			   error indication. */

net/802/psnap.c

+12 −5
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev, 
		.type = __constant_htons(ETH_P_SNAP),

	};



	if (unlikely(!pskb_may_pull(skb, 5)))

		goto drop;



	rcu_read_lock();

	proto = find_snap_client(skb_transport_header(skb));

	if (proto) {
@@ -62,14 +65,18 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev, 
		skb->transport_header += 5;

		skb_pull_rcsum(skb, 5);

		rc = proto->rcvfunc(skb, dev, &snap_packet_type, orig_dev);

	} else {

		skb->sk = NULL;

		kfree_skb(skb);

		rc = 1;

	}



	rcu_read_unlock();



	if (unlikely(!proto))

		goto drop;



out:

	return rc;



drop:

	kfree_skb(skb);

	goto out;

}



/*

net/dccp/ccids/ccid2.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len) 
		int rc;



		ccid2_pr_debug("allocating more space in history\n");

		rc = ccid2_hc_tx_alloc_seq(hctx, CCID2_SEQBUF_LEN, GFP_KERNEL);

		rc = ccid2_hc_tx_alloc_seq(hctx, CCID2_SEQBUF_LEN, gfp_any());

		BUG_ON(rc); /* XXX what do we do? */



		next = hctx->ccid2hctx_seqh->ccid2s_next;

net/ipv6/ip6_output.c

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) 
		/*

		 *	Copy a block of the IP datagram.

		 */

		if (skb_copy_bits(skb, ptr, skb_transport_header(skb), len))

		if (skb_copy_bits(skb, ptr, skb_transport_header(frag), len))

			BUG();

		left -= len;

net/irda/irmod.c

+1 −1
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ static int __init irda_init(void) 
 out_err_3:

#ifdef CONFIG_SYSCTL

	irda_sysctl_unregister();

#endif

 out_err_2:

#endif

#ifdef CONFIG_PROC_FS

	irda_proc_unregister();

#endif