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

Commit 79f55f11 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

nf/dccp: merge errorpaths 



Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e780f1c3

net/netfilter/xt_dccp.c

+9 −7
Original line number Diff line number Diff line
@@ -45,10 +45,8 @@ dccp_find_option(u_int8_t option, 
	unsigned int optlen = dh->dccph_doff*4 - __dccp_hdr_len(dh);

	unsigned int i;



	if (dh->dccph_doff * 4 < __dccp_hdr_len(dh)) {

		*hotdrop = true;

		return false;

	}

	if (dh->dccph_doff * 4 < __dccp_hdr_len(dh))

		goto invalid;



	if (!optlen)

		return false;
@@ -57,9 +55,7 @@ dccp_find_option(u_int8_t option, 
	op = skb_header_pointer(skb, protoff + optoff, optlen, dccp_optbuf);

	if (op == NULL) {

		/* If we don't have the whole header, drop packet. */

		spin_unlock_bh(&dccp_buflock);

		*hotdrop = true;

		return false;

		goto partial;

	}



	for (i = 0; i < optlen; ) {
@@ -76,6 +72,12 @@ dccp_find_option(u_int8_t option, 


	spin_unlock_bh(&dccp_buflock);

	return false;



partial:

	spin_unlock_bh(&dccp_buflock);

invalid:

	*hotdrop = true;

	return false;

}