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

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

[DCCP]: Ignore feature negotiation on Data packets 



This implements [RFC 4340, p. 32]: "any feature negotiation options received
on DCCP-Data packets MUST be ignored".

Also added a FIXME for further processing, since the code currently (wrongly)
classifies empty Confirm options as invalid - this needs to be resolved in
a separate patch.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5cdae198

net/dccp/options.c

+5 −1
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq, 
		case DCCPO_CHANGE_L:

			/* fall through */

		case DCCPO_CHANGE_R:

			if (pkt_type == DCCP_PKT_DATA)

				break;

			if (len < 2)

				goto out_invalid_option;

			rc = dccp_feat_change_recv(sk, opt, *value, value + 1,
@@ -148,7 +150,9 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq, 
		case DCCPO_CONFIRM_L:

			/* fall through */

		case DCCPO_CONFIRM_R:

			if (len < 2)

			if (pkt_type == DCCP_PKT_DATA)

				break;

			if (len < 2)	/* FIXME this disallows empty confirm */

				goto out_invalid_option;

			if (dccp_feat_confirm_recv(sk, opt, *value,

						   value + 1, len - 1))