From: Pavel Šimerda <psimerda@redhat.com>
Date: Mon, 13 Apr 2015 14:00:57 +0000 (+0200)
Subject: ip-xfrm: support 'proto any' with 'sport' and 'dport'
X-Git-Tag: v4.1.0~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11a3e5c4b31530840d6ea4339ce4078d5922b5d6;p=thirdparty%2Fiproute2.git

ip-xfrm: support 'proto any' with 'sport' and 'dport'

When creating an IPsec SA that sets 'proto any' (IPPROTO_IP) and
specifies 'sport' and 'dport' at the same time in selector, the
following error is issued:

"sport" and "dport" are invalid with proto=ip

However using IPPROTO_IP with ports is completely legal and necessary
when one wants to share the SA on both TCP and UDP. One of the
applications requiring sharing SAs is 3GPP IMS AKA authentication.

See also:

 * https://bugzilla.redhat.com/show_bug.cgi?id=497355

Reported-by: Jiří Klimeš <jklimes@redhat.com>
Signed-off-by: Pavel Šimerda <psimerda@redhat.com>
---

diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index 9aaf58d5b..9c2642890 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -1344,6 +1344,7 @@ static int xfrm_selector_upspec_parse(struct xfrm_selector *sel,
 		case IPPROTO_UDP:
 		case IPPROTO_SCTP:
 		case IPPROTO_DCCP:
+		case IPPROTO_IP: /* to allow shared SA for different protocols */
 			break;
 		default:
 			fprintf(stderr, "\"sport\" and \"dport\" are invalid with PROTO value \"%s\"\n", strxf_proto(sel->proto));