Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp1970445rwe; Fri, 2 Sep 2022 06:47:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR6ymTtTXu7N370V7mgSN+5Z/OqBHz9t7PZfd/qznHdvHoZf4rDK5Qc/rI1sN61xA6fNHBnc X-Received: by 2002:a17:902:ab5d:b0:175:5e44:1619 with SMTP id ij29-20020a170902ab5d00b001755e441619mr7645543plb.21.1662126437280; Fri, 02 Sep 2022 06:47:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662126437; cv=none; d=google.com; s=arc-20160816; b=roryNCt0vrJ5+b+ljZcPVWMeg+Mu8OviTNY9KvMutCo39FjhhWZ+Nhl7DJHC5bv0Ak cXRb0I+dvBQwHW8nDnUTshDtFgOp2rrkHK6gLc7dDjcfbpJ31+Kualq1QkSdy12kaqTg rS2++0VRM7AkzpJDCWD60uYnE/4LLBhngtQi8IHTks2G1XAmSTJ+gULd2bBptU9PAqQj XxZR1Oll8jGY5o9lsHVPUfySaJVSwLsoUjpUc/5ev4tQjJOF8IlOqdwUXOZ/MhI4uf+l 5nM+59XkBL0oxSVwJpvhR01BiOJLEEuNwM1G+syzBJxqNwazn8z6NkwzOCB+hgFnBr68 RrqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/Fe554ApcLkhBPN+I3WK1WZ2Emt2o5AVK2oxgCIQ/wc=; b=cpuF42ducOD+bJd1sZnclmVnymo5mH/A2cSelfkcAYV0lZhewBsR8MZPofmvPQPulq vC6E3hVFOuOLUDtixiSSIGz3WE0q8MWTGzfsbxtcbHwNhi/hOrVQ/fS/B5Kpeh6oICLC mEPsxNEdyer/3ZEGv1GunJg3cgm6TG1oDyYKM74gu4KBRbaMLOf26+CIIVPHbRWty8Da 90bBHcc87J71GkUoTlkpzlHx4+RARQkogxQDV6WpO0fpqwAJ9EvtKQf4Juhi9tud7ea3 Foxu3stHTxxj3HkyR4LDXbq4UGeAquqDujdlvyra1DHYhvQd4uGY86dQBNtv6XrOsoS7 D/wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ds1sv1rq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nl3-20020a17090b384300b001faa7b96ca0si2346893pjb.13.2022.09.02.06.47.04; Fri, 02 Sep 2022 06:47:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ds1sv1rq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237022AbiIBMhc (ORCPT + 99 others); Fri, 2 Sep 2022 08:37:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237062AbiIBMhA (ORCPT ); Fri, 2 Sep 2022 08:37:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F49FE5886; Fri, 2 Sep 2022 05:29:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DFC8AB829B6; Fri, 2 Sep 2022 12:27:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EC89C433D6; Fri, 2 Sep 2022 12:27:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662121677; bh=X1ADLifz4xkdtxx8IQXklXNBOLgY87zEzsW+DZA+a/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ds1sv1rqgF5yX1Y9PqtaBJbMNSEBhir7SVZqhkL87bPjdQRd514x2vkUva/ud8zQq ZDOqjNZXU+fus/KUYj6ZhwpP9nUPNPD4ReQ06OWX0U5rBxcF+7tfvov7JYfETcKtW+ EnURGxPTyl/Ln/5FKhRUmp0gVn/ZCJet7mxMmTvk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.4 22/77] netfilter: nft_payload: report ERANGE for too long offset and length Date: Fri, 2 Sep 2022 14:18:31 +0200 Message-Id: <20220902121404.392669371@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121403.569927325@linuxfoundation.org> References: <20220902121403.569927325@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Neira Ayuso [ Upstream commit 94254f990c07e9ddf1634e0b727fab821c3b5bf9 ] Instead of offset and length are truncation to u8, report ERANGE. Fixes: 96518518cc41 ("netfilter: add nftables") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nft_payload.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c index cf0512fc648e7..7520ec17cabb7 100644 --- a/net/netfilter/nft_payload.c +++ b/net/netfilter/nft_payload.c @@ -624,6 +624,7 @@ nft_payload_select_ops(const struct nft_ctx *ctx, { enum nft_payload_bases base; unsigned int offset, len; + int err; if (tb[NFTA_PAYLOAD_BASE] == NULL || tb[NFTA_PAYLOAD_OFFSET] == NULL || @@ -649,8 +650,13 @@ nft_payload_select_ops(const struct nft_ctx *ctx, if (tb[NFTA_PAYLOAD_DREG] == NULL) return ERR_PTR(-EINVAL); - offset = ntohl(nla_get_be32(tb[NFTA_PAYLOAD_OFFSET])); - len = ntohl(nla_get_be32(tb[NFTA_PAYLOAD_LEN])); + err = nft_parse_u32_check(tb[NFTA_PAYLOAD_OFFSET], U8_MAX, &offset); + if (err < 0) + return ERR_PTR(err); + + err = nft_parse_u32_check(tb[NFTA_PAYLOAD_LEN], U8_MAX, &len); + if (err < 0) + return ERR_PTR(err); if (len <= 4 && is_power_of_2(len) && IS_ALIGNED(offset, len) && base != NFT_PAYLOAD_LL_HEADER) -- 2.35.1