[DCCP]: Ignore feature negotiation on Data packets (cf86314c) · Commits · 戴 / test

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:

Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by:

Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

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))

Admin message