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

Commit 89e7e577 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[DCCPv6]: Add a FIXME for missing IPV6_PKTOPTIONS 

This refers to the possible memory leak pointed out in
http://www.mail-archive.com/dccp@vger.kernel.org/msg00574.html,
fixed by David Miller in
http://www.mail-archive.com/netdev@vger.kernel.org/msg24881.html



and adds a FIXME to point out where code is missing.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent 60361be1

net/dccp/ipv6.c

+6 −2
Original line number Diff line number Diff line
@@ -990,13 +990,17 @@ static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
	                                       --ANK (980728)

	 */

	if (np->rxopt.all)

	/*

	 * FIXME: Add handling of IPV6_PKTOPTIONS skb. See the comments below

	 *        (wrt ipv6_pktopions) and net/ipv6/tcp_ipv6.c for an example.

	 */

		opt_skb = skb_clone(skb, GFP_ATOMIC);



	if (sk->sk_state == DCCP_OPEN) { /* Fast path */

		if (dccp_rcv_established(sk, skb, dccp_hdr(skb), skb->len))

			goto reset;

		if (opt_skb) {

			/* This is where we would goto ipv6_pktoptions. */

			/* XXX This is where we would goto ipv6_pktoptions. */

			__kfree_skb(opt_skb);

		}

		return 0;
@@ -1024,7 +1028,7 @@ static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
	if (dccp_rcv_state_process(sk, skb, dccp_hdr(skb), skb->len))

		goto reset;

	if (opt_skb) {

		/* This is where we would goto ipv6_pktoptions. */

		/* XXX This is where we would goto ipv6_pktoptions. */

		__kfree_skb(opt_skb);

	}

	return 0;