From patchwork Fri Jun 7 16:07:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 13690491 X-Patchwork-Delegate: paul@paul-moore.com Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1107419AA62 for ; Fri, 7 Jun 2024 16:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717776485; cv=none; b=ZUUzV9odf8PKOL06fGMiEIA1iYfS02TdQsvZkcxNllezLpUVzqIt4yEvX8XoyzJMUwpv/7Ri2Vmjz5J3VequkzF9p+uEN7sxEbyuhgYeXnAoB/2dAL3WKpqYvVFJ6UZrWTmus43LtL+kg2y6sI3322vRuDs5LagGZGsZvswhBpI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717776485; c=relaxed/simple; bh=YgmzlEZajTJwWqIWiRCWdSe8ddo/mS7cu6s5R2/CTYk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=s6q2R4RAb2OTzG/nNp11vgAOwNB2m8GqwM5hu+VGw/QS8KiBr7KqgdSyGklCpgFhlIgxwVkIIxk5dJ4jwkFXUmvuEDNkYgNErMiQEYT2xnmIcmJuf1tXaiUmUfHk55HuF5nK2meDOpMTgIa4i2bIgC4nPQiBqAMRXnrfDWQHvqc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=RBLTm3ya; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RBLTm3ya" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717776482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5TBI1j6kx25TFs50gZy5PJ7jXuDWillUKGNEfVq7Zbs=; b=RBLTm3yaIqiVi8U1p+H5zg1S2kifVItFs1ORp2ltXEhhfhpSCI9Kf4s8LLjtimXuouMSXi jlE3MWN278nsOV6kfJt12AiHoyIWc0w2XxUG82tCORJJw941VYkjYAiiRHYwl/WUK8qMPR hjhaapp3zG/cxLcQG+zf3t4zvTKEgFs= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-586-DlTiC_uPOyC2nXqvB5TglQ-1; Fri, 07 Jun 2024 12:07:59 -0400 X-MC-Unique: DlTiC_uPOyC2nXqvB5TglQ-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a592c35ac06so229307466b.0 for ; Fri, 07 Jun 2024 09:07:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717776478; x=1718381278; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5TBI1j6kx25TFs50gZy5PJ7jXuDWillUKGNEfVq7Zbs=; b=dS2qx2OppZkNOq7hWa8YgFqHWLVirTCbAplMktgANlMZMio/80k9is03BPmv3FQcUR wbaXZ4CW96vdHAKDkZZtu9kAsjdp27H1++INxI6I/iIg7G9A7WX0bP7J5ii/m1Gxop4y mx/dAQEsagIYPyxMt3hEB8xOX6X4wQk4C3VQcX0OKjD/ucsj5S0/C0tBvYIk7dvaoDc7 IaT4wiW5mE4faal3QSJAQAgho2XP+26fcFpK4XHbJur35Tdsc6GFkLsxdQAs8q1Qp2Mi 5VBUhLECpryJPIdfOSgReKfxNlR9iYKnKYNgxMdNOdQhCJgrrVLYyV06BwmxHTIwuq5n a+5A== X-Forwarded-Encrypted: i=1; AJvYcCVkV01d9mtZwBhf5mT2E4xUjpgGUwLxv2cPr/Kad9ays6qrL68UiY0KKcAIyRCjHNoLAiNT3dvnV2T77+Wzo8yd2ntBs3A+26dvRFaRkFXs0pFBX9nu X-Gm-Message-State: AOJu0Yy36lnGGVln7nGS02eR1Wu+IaSQhpcEbFAbaDEfZWZNAi6nHrDr gkhaaemi97LnAtEDOpM4PJMDN8zKTYgtcpjmUkiUukpgzbgYdjk/ZsLKrqD4vo154FRzuFMUrMf txsSMmcbCEFHzRO6bG8b5P6r338vhkreYV5pdTtcx+6Cs+if4xi27ZvlHmfXEU00+/O/32j7ZPg Tsif20J2mW X-Received: by 2002:a17:906:3c6:b0:a68:e834:e9bb with SMTP id a640c23a62f3a-a6c7651abf6mr482856266b.35.1717776477948; Fri, 07 Jun 2024 09:07:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG1KUiDsNlI7ASi3MzLgO1C/g1AGhrUFu1XlKQH6QLi0peo0XwsPFrtQxIXKCBtcB44XE8hlw== X-Received: by 2002:a17:906:3c6:b0:a68:e834:e9bb with SMTP id a640c23a62f3a-a6c7651abf6mr482854966b.35.1717776477630; Fri, 07 Jun 2024 09:07:57 -0700 (PDT) Received: from telekom.ip (adsl-dyn127.78-99-32.t-com.sk. [78.99.32.127]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6c806ebd59sm264672166b.116.2024.06.07.09.07.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 09:07:57 -0700 (PDT) From: Ondrej Mosnacek To: Paul Moore Cc: netdev@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v2 1/2] cipso: fix total option length computation Date: Fri, 7 Jun 2024 18:07:52 +0200 Message-ID: <20240607160753.1787105-2-omosnace@redhat.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240607160753.1787105-1-omosnace@redhat.com> References: <20240607160753.1787105-1-omosnace@redhat.com> Precedence: bulk X-Mailing-List: linux-security-module@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com As evident from the definition of ip_options_get(), the IP option IPOPT_END is used to pad the IP option data array, not IPOPT_NOP. Yet the loop that walks the IP options to determine the total IP options length in cipso_v4_delopt() doesn't take IPOPT_END into account. Fix it by recognizing the IPOPT_END value as the end of actual options. Fixes: 014ab19a69c3 ("selinux: Set socket NetLabel based on connection endpoint") Signed-off-by: Ondrej Mosnacek --- net/ipv4/cipso_ipv4.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index dd6d460150580..5e9ac68444f89 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -2013,12 +2013,16 @@ static int cipso_v4_delopt(struct ip_options_rcu __rcu **opt_ptr) * from there we can determine the new total option length */ iter = 0; optlen_new = 0; - while (iter < opt->opt.optlen) - if (opt->opt.__data[iter] != IPOPT_NOP) { + while (iter < opt->opt.optlen) { + if (opt->opt.__data[iter] == IPOPT_END) { + break; + } else if (opt->opt.__data[iter] == IPOPT_NOP) { + iter++; + } else { iter += opt->opt.__data[iter + 1]; optlen_new = iter; - } else - iter++; + } + } hdr_delta = opt->opt.optlen; opt->opt.optlen = (optlen_new + 3) & ~3; hdr_delta -= opt->opt.optlen; From patchwork Fri Jun 7 16:07:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 13690492 X-Patchwork-Delegate: paul@paul-moore.com Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4C5018629B for ; Fri, 7 Jun 2024 16:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717776485; cv=none; b=cNyNUNL7+LUZwuJapX0WoPgZW7NttFPz2d6oVaOzwLSIm1coZBgzRQ550u3/HVQvYquTnRRZjsVf8j3ZUlg1BkagfNDR/y2aECiTlUqFMDZ+MmRFxmrNig0BO5K0CHRcoDaGXeqHkJvWzYBGJJJKlKXfDXmv3ce1/Zrqami69g0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717776485; c=relaxed/simple; bh=QglwNdcsA51J6wQYL6H/q82x8oDdhH78HGfeiSZECsc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cNCwIdLKBFHYOOioInEf/9O2rfXswjnnoqdhhoQ7rWQ5KdgGUU5S13Gv/GHIhTMrmbMQj3U/wpdhdRAcNUaszvfXb+qHswPHSggD/jBVHQa/J6nERi6pwSE0GJk1DmdUyPyGJ9X7VsHZoL/8hK8+vgn4Vjj5ym2/SRjSRtVRFRM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=VEot8apf; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VEot8apf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717776482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8U3+g6YznrIZbdPROW/ErLXZCEgBfJNaERO2crh9nyw=; b=VEot8apf0pSeyxWlKzVMZkrQCodbBAsWYQOm3pPq4wF6m0g8nat6CzsQD+Lh22sjvgXKRF /k62/QihN6L+7wdK9qj5ydvCg2fon4hu/WuFMOdHQ94whCtkgZBjhksXz456x6y5ncnhPY 6lHSEQD43h0dSmnEhB7LfAnnSRpkvyk= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-Hedw_D2nNiCgBjZ0-S77Pw-1; Fri, 07 Jun 2024 12:08:01 -0400 X-MC-Unique: Hedw_D2nNiCgBjZ0-S77Pw-1 Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2ea91ce9225so20560301fa.3 for ; Fri, 07 Jun 2024 09:08:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717776480; x=1718381280; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8U3+g6YznrIZbdPROW/ErLXZCEgBfJNaERO2crh9nyw=; b=tvkcTRVfkS1XexNcLJ2uysD1HP0wJ1kakAqRCmxQcYyoqoyJ/8NbiecMZh68e24aD0 iF0wzZH6/Hmg0Lkjja12V7TbfrnNcTaRj7q3JTETOdtQ+TPfmK1KZV+R6ob1ltEzc7lI dcN1aE5XOIDaXmDAj75zxpnxRbRKG8QVYMi98hjpVpJxdlEc2hABWJL3rQH96brJCrzd oKDt7dn66Vu7jqqhGqH4KLF1Ts9CDoK3uzZbPZdqxdfWSWCYdrOCLespBLP0pj0Fyz2F Fb2X05+H25jMHWBYNhp9/EJAwDYq+Q/PsufMLiCgNdQCtpFYtZTABKDONw2jU3xGYnWF eEhg== X-Forwarded-Encrypted: i=1; AJvYcCUUmMkW7XfcchvL6t0E2bjTt4rqnQ5kMVMEaBKSEElx0iCfsJ02j5i7ZD7eTaDvgXQK01uNGEM5+A++OX5hyzvn6suwxtYcmpM0icmGYijy84rOYh7N X-Gm-Message-State: AOJu0Yw03s7O+4Biap8kNlTXmNl53kqL9ACc1enrc0bzTYolsbAFY2Rd AUkBjVLZ/E03OFwY6OmbrPqKn/fT/blav7KwhZxi6HW1dRKczqItSdl+vNomHAnlKjVl/3oT94x R6EkFezgl6T7KtP8bS3nEFdZasvUKZD87w1o5Md1Zqd64DGWMInsXuxGybUsuGmSMxlzANPwQHQ == X-Received: by 2002:a2e:890d:0:b0:2ea:904e:481c with SMTP id 38308e7fff4ca-2eadcea97e0mr23697741fa.53.1717776480034; Fri, 07 Jun 2024 09:08:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH4L3C+xdL2eKbxFZaKahGICbEU8EtZXqMbTaMd8HBKPo9qrXs2Jc8UZ+3KVo8TpRZHUAsryw== X-Received: by 2002:a2e:890d:0:b0:2ea:904e:481c with SMTP id 38308e7fff4ca-2eadcea97e0mr23697601fa.53.1717776479693; Fri, 07 Jun 2024 09:07:59 -0700 (PDT) Received: from telekom.ip (adsl-dyn127.78-99-32.t-com.sk. [78.99.32.127]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6c806ebd59sm264672166b.116.2024.06.07.09.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 09:07:58 -0700 (PDT) From: Ondrej Mosnacek To: Paul Moore Cc: netdev@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v2 2/2] cipso: make cipso_v4_skbuff_delattr() fully remove the CIPSO options Date: Fri, 7 Jun 2024 18:07:53 +0200 Message-ID: <20240607160753.1787105-3-omosnace@redhat.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240607160753.1787105-1-omosnace@redhat.com> References: <20240607160753.1787105-1-omosnace@redhat.com> Precedence: bulk X-Mailing-List: linux-security-module@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com As the comment in this function says, the code currently just clears the CIPSO part with IPOPT_NOP, rather than removing it completely and trimming the packet. The other cipso_v4_*_delattr() functions, however, do the proper removal and also calipso_skbuff_delattr() makes an effort to remove the CALIPSO options instead of replacing them with padding. Some routers treat IPv4 packets with anything (even NOPs) in the option header as a special case and take them through a slower processing path. Consequently, hardening guides such as STIG recommend to configure such routers to drop packets with non-empty IP option headers [1][2]. Thus, users might expect NetLabel to produce packets with minimal padding (or at least with no padding when no actual options are present). Implement the proper option removal to address this and to be closer to what the peer functions do. [1] https://www.stigviewer.com/stig/juniper_router_rtr/2019-09-27/finding/V-90937 [2] https://www.stigviewer.com/stig/cisco_ios_xe_router_rtr/2021-03-26/finding/V-217001 Signed-off-by: Ondrej Mosnacek --- net/ipv4/cipso_ipv4.c | 79 +++++++++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 25 deletions(-) diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index 5e9ac68444f89..e9cb27061c12e 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -1810,6 +1810,29 @@ static int cipso_v4_genopt(unsigned char *buf, u32 buf_len, return CIPSO_V4_HDR_LEN + ret_val; } +static int cipso_v4_get_actual_opt_len(const unsigned char *data, int len) +{ + int iter = 0, optlen = 0; + + /* determining the new total option length is tricky because of + * the padding necessary, the only thing i can think to do at + * this point is walk the options one-by-one, skipping the + * padding at the end to determine the actual option size and + * from there we can determine the new total option length + */ + while (iter < len) { + if (data[iter] == IPOPT_END) { + break; + } else if (data[iter] == IPOPT_NOP) { + iter++; + } else { + iter += data[iter + 1]; + optlen = iter; + } + } + return optlen; +} + /** * cipso_v4_sock_setattr - Add a CIPSO option to a socket * @sk: the socket @@ -1986,7 +2009,6 @@ static int cipso_v4_delopt(struct ip_options_rcu __rcu **opt_ptr) u8 cipso_len; u8 cipso_off; unsigned char *cipso_ptr; - int iter; int optlen_new; cipso_off = opt->opt.cipso - sizeof(struct iphdr); @@ -2006,23 +2028,8 @@ static int cipso_v4_delopt(struct ip_options_rcu __rcu **opt_ptr) memmove(cipso_ptr, cipso_ptr + cipso_len, opt->opt.optlen - cipso_off - cipso_len); - /* determining the new total option length is tricky because of - * the padding necessary, the only thing i can think to do at - * this point is walk the options one-by-one, skipping the - * padding at the end to determine the actual option size and - * from there we can determine the new total option length */ - iter = 0; - optlen_new = 0; - while (iter < opt->opt.optlen) { - if (opt->opt.__data[iter] == IPOPT_END) { - break; - } else if (opt->opt.__data[iter] == IPOPT_NOP) { - iter++; - } else { - iter += opt->opt.__data[iter + 1]; - optlen_new = iter; - } - } + optlen_new = cipso_v4_get_actual_opt_len(opt->opt.__data, + opt->opt.optlen); hdr_delta = opt->opt.optlen; opt->opt.optlen = (optlen_new + 3) & ~3; hdr_delta -= opt->opt.optlen; @@ -2242,7 +2249,8 @@ int cipso_v4_skbuff_setattr(struct sk_buff *skb, */ int cipso_v4_skbuff_delattr(struct sk_buff *skb) { - int ret_val; + int ret_val, cipso_len, hdr_len_actual, new_hdr_len_actual, new_hdr_len, + hdr_len_delta; struct iphdr *iph; struct ip_options *opt = &IPCB(skb)->opt; unsigned char *cipso_ptr; @@ -2255,16 +2263,37 @@ int cipso_v4_skbuff_delattr(struct sk_buff *skb) if (ret_val < 0) return ret_val; - /* the easiest thing to do is just replace the cipso option with noop - * options since we don't change the size of the packet, although we - * still need to recalculate the checksum */ - iph = ip_hdr(skb); cipso_ptr = (unsigned char *)iph + opt->cipso; - memset(cipso_ptr, IPOPT_NOOP, cipso_ptr[1]); + cipso_len = cipso_ptr[1]; + + hdr_len_actual = sizeof(struct iphdr) + + cipso_v4_get_actual_opt_len((unsigned char *)(iph + 1), + opt->optlen); + new_hdr_len_actual = hdr_len_actual - cipso_len; + new_hdr_len = (new_hdr_len_actual + 3) & ~3; + hdr_len_delta = (iph->ihl << 2) - new_hdr_len; + + /* 1. shift any options after CIPSO to the left */ + memmove(cipso_ptr, cipso_ptr + cipso_len, + new_hdr_len_actual - opt->cipso); + /* 2. move the whole IP header to its new place */ + memmove((unsigned char *)iph + hdr_len_delta, iph, new_hdr_len_actual); + /* 3. adjust the skb layout */ + skb_pull(skb, hdr_len_delta); + skb_reset_network_header(skb); + iph = ip_hdr(skb); + /* 4. re-fill new padding with IPOPT_END (may now be longer) */ + memset((unsigned char *)iph + new_hdr_len_actual, IPOPT_END, + new_hdr_len - new_hdr_len_actual); + + opt->optlen -= hdr_len_delta; opt->cipso = 0; opt->is_changed = 1; - + if (hdr_len_delta != 0) { + iph->ihl = new_hdr_len >> 2; + iph_set_totlen(iph, skb->len); + } ip_send_check(iph); return 0;