From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AC18C7618F for ; Mon, 15 Jul 2019 14:59:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31FC6205ED for ; Mon, 15 Jul 2019 14:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563202746; bh=OU8NVByJ0ln4t7F2DcfI/lh/52kOMBthEly44LH91No=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=um9pXDCJiggkRrq4g23zq2XI0yP2QULHaPnhYNNUDKU1bMVse+Jxoybm6RDn4Xbrp xY7ARD40ykmYrPPtrEPZEiO5DhCAvALgEtx6IwWkGl7VOVr5MZ8AQF+bhZQD//yzzD grEsEsxoN0Sz7NO4xSPGpqt/zcvmW5OXp9JQUL0o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390084AbfGOOTV (ORCPT ); Mon, 15 Jul 2019 10:19:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:40706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390068AbfGOOTT (ORCPT ); Mon, 15 Jul 2019 10:19:19 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C5D95217D9; Mon, 15 Jul 2019 14:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563200358; bh=OU8NVByJ0ln4t7F2DcfI/lh/52kOMBthEly44LH91No=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0MIyOg7/k44eCe0A9LNIAsc5RhMWr70cXna8kBQk5u90Bls1F06zYDlMK3wfpE8Rc 68P6xEdqtrccwtRyjZX0TrSbQBojLym5hdWwnS7cBcI4+F8S0/YIRDgMtywC8F5qE6 LrEqQdXu92ijdf9SfRtEdKa0puf918ztRZEbaIIw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Anirudh Gupta , Anirudh Gupta , Herbert Xu , Steffen Klassert , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 024/158] xfrm: Fix xfrm sel prefix length validation Date: Mon, 15 Jul 2019 10:15:55 -0400 Message-Id: <20190715141809.8445-24-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715141809.8445-1-sashal@kernel.org> References: <20190715141809.8445-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Anirudh Gupta [ Upstream commit b38ff4075a80b4da5cb2202d7965332ca0efb213 ] Family of src/dst can be different from family of selector src/dst. Use xfrm selector family to validate address prefix length, while verifying new sa from userspace. Validated patch with this command: ip xfrm state add src 1.1.6.1 dst 1.1.6.2 proto esp spi 4260196 \ reqid 20004 mode tunnel aead "rfc4106(gcm(aes))" \ 0x1111016400000000000000000000000044440001 128 \ sel src 1011:1:4::2/128 sel dst 1021:1:4::2/128 dev Port5 Fixes: 07bf7908950a ("xfrm: Validate address prefix lengths in the xfrm selector.") Signed-off-by: Anirudh Gupta Acked-by: Herbert Xu Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- net/xfrm/xfrm_user.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 2122f89f6155..d80d54e663c0 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -150,6 +150,22 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, err = -EINVAL; switch (p->family) { + case AF_INET: + break; + + case AF_INET6: +#if IS_ENABLED(CONFIG_IPV6) + break; +#else + err = -EAFNOSUPPORT; + goto out; +#endif + + default: + goto out; + } + + switch (p->sel.family) { case AF_INET: if (p->sel.prefixlen_d > 32 || p->sel.prefixlen_s > 32) goto out; -- 2.20.1