Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp891032rwb; Mon, 26 Sep 2022 07:10:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5W5i/J34d+qg0BDef+j65QpWEKCjtXLUyULYUh9sR/aOqO5rfEIHInkBop3GLa9xsvr8j6 X-Received: by 2002:a05:6402:914:b0:451:22c5:2e28 with SMTP id g20-20020a056402091400b0045122c52e28mr22958153edz.294.1664201415311; Mon, 26 Sep 2022 07:10:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664201415; cv=none; d=google.com; s=arc-20160816; b=EI6H6eJpOnUN1QiT5fBMn/w2Bb6PATnB4b5QfyApDDLZ5AHN/8x1dK5u3K8FzFDCwm rA/4SjBbjrWP/6uHiYKF4wZNFdtS0TXVQyLkQHvW1Kd2vnQ9Uv2HNnJ/ZjeysawQ4j8/ 8jfXFgIRTSFXQOnkUO++5Z0pInfW9eTdHUdqh6bIxb6/nexlL3LshtCWs5tACdCm/CtS Xl2fLYTacoaZ2gT5G2BNFsaAhjbiBNJ5lc2Du6HB+MHU9wg8E2nbswiEYyfGjF4anf4S vdT7Cy7pjo41HG27cW3lilw4771LWXADimv1sZlYoYRJw3H02kFTzAkN17z9Ku4YYMQy WP9w== 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=oEhqCt+mWwBJDaFtB39dQ3V1InLptpWYxxPxQsQ+OII=; b=zHrJN/AI1LGlzaXT5mv0+Z8+YEscTSXFE6KQzO8sXqBy6r5Wb2GbKKlGLP9HRE1oSo MCD9g4gBDXUgrTiFi9HWgIIYxl2iTqOgPA7fVfv/rradi6OfT530uXis5C698WtG4S35 Axpu/ob0Z7Q9eL8b1Lq+GlmRmXpWUzeixzlj/irZR32QOlAqCfAbJwJVtRwmkoVeDVW3 hfODeBTYIKq8tzOTXFBA21QG6Ar7HMSj8oMJdJ7YbHHkoBixpEDr3vhQgYFM/6/BXzTt yAbk0eo10JcKeoXhc1kZZx8ZIqdh36cQmGKKZqyQvOIS0Mp71euAc3CCc/4wcVmcBB6a oLNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ra2XtkiF; 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 d15-20020a50cd4f000000b00447dfae6181si17413194edj.235.2022.09.26.07.09.47; Mon, 26 Sep 2022 07:10:15 -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=Ra2XtkiF; 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 S237427AbiIZLQa (ORCPT + 99 others); Mon, 26 Sep 2022 07:16:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237633AbiIZLPr (ORCPT ); Mon, 26 Sep 2022 07:15:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CD3165270; Mon, 26 Sep 2022 03:37:20 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 7C09F60769; Mon, 26 Sep 2022 10:37:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BC1AC433C1; Mon, 26 Sep 2022 10:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664188623; bh=Rlz1uuBrqfQ6EF641OQ2/zzhC5dy/G4tP1g7Ph7c544=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ra2XtkiF0oA00jt0i/M7TJxEOqXPpdCd9H4fDSpElKGXf6xDMSZN8OtKjO5/kqLNl FeD7nYPfUIGtpM46zRSa+GRtD9adhoLLUyZl/OK2ulS1tqnqMNWTedgjKaOcjg7ltX Y1MVukx1blsMAJ5uLMttM0ma2YYcfSxNazDNkbXI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso , Florian Westphal , Sasha Levin Subject: [PATCH 5.15 068/148] netfilter: nfnetlink_osf: fix possible bogus match in nf_osf_find() Date: Mon, 26 Sep 2022 12:11:42 +0200 Message-Id: <20220926100758.594885630@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926100756.074519146@linuxfoundation.org> References: <20220926100756.074519146@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.2 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 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 559c36c5a8d730c49ef805a72b213d3bba155cc8 ] nf_osf_find() incorrectly returns true on mismatch, this leads to copying uninitialized memory area in nft_osf which can be used to leak stale kernel stack data to userspace. Fixes: 22c7652cdaa8 ("netfilter: nft_osf: Add version option support") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- net/netfilter/nfnetlink_osf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nfnetlink_osf.c b/net/netfilter/nfnetlink_osf.c index 0fa2e2030427..ee6840bd5933 100644 --- a/net/netfilter/nfnetlink_osf.c +++ b/net/netfilter/nfnetlink_osf.c @@ -269,6 +269,7 @@ bool nf_osf_find(const struct sk_buff *skb, struct nf_osf_hdr_ctx ctx; const struct tcphdr *tcp; struct tcphdr _tcph; + bool found = false; memset(&ctx, 0, sizeof(ctx)); @@ -283,10 +284,11 @@ bool nf_osf_find(const struct sk_buff *skb, data->genre = f->genre; data->version = f->version; + found = true; break; } - return true; + return found; } EXPORT_SYMBOL_GPL(nf_osf_find); -- 2.35.1