Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2439374pxp; Mon, 7 Mar 2022 15:42:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJxVVs/jYN93fllHO9ZOa5GAq3HTCFPSelpILpi0IuqBCSXR4bWtyhLZt8j0j4cnniVIzC0J X-Received: by 2002:a17:902:ccc6:b0:14f:88e6:8040 with SMTP id z6-20020a170902ccc600b0014f88e68040mr14420434ple.13.1646696568635; Mon, 07 Mar 2022 15:42:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646696568; cv=none; d=google.com; s=arc-20160816; b=Zvn/wMptSjB1ClvFTCB+aX1ZgIS61Ng2AcsfEomlTlVFnWlQF6LvxhbwlR+EcS6YQw U/XHM46Ao0cyWO5HdcEEMR28phnDTbMprElkjBeO2qzul9wRhNJ46SDaCec+fc3yQPf0 gxu5knJj76++JGp4p8Jye3Hp/ERSsFYvo1D7+4D/rbVuOcksab7YH896NL6ZIvLwbiPQ XYRBKeYTfrTwJwEqiTCM8mRsX38gaSk4GFhol7ZPhLFBAZhPh0m1VsqI0X+IVvEVJLey lngKOBRkPy/mxM0MPXtAZpsTPFN83SDhWAikbh+PXilwFNO3g21LmBGh24tuSOn5y5AK X8LA== 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=JlVo4oX2dvin+beMzlJSNCsox9c3T1nimNxS9gpuKvU=; b=Bvmt8xls3alwcG6MCdi/zE6JF+HApTMT7eIulRdkRD1BHophyY2wW2qkKZfM6r8jxA 56VrOEKUJHfVL9J1i11hAdBV5JjVDGEzUgwNRRryH/ImmLPIs+tV+OsJmfxW9mAlTXcS hJREfqf9oW1Auw1G3QcvZQaxTseJRXCJBVr+1svNL1lNe2wvokIt77VSIORnZyczMkFD tpivetMVTwQrmp5o1s0AHUCvWn+x+BLTFn82aTycHfCoR5RdxtaBPdx63OTs1oYbNGAr rNEFDLx43pFvf8pepIwyZP/0WlAdUcJ36NQzHZmjm2J0pD/Qm/1+9axksEl7CFXnui1b PCcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="dwdfiGh/"; 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 o8-20020a170902d4c800b00151a898b84asi14210898plg.462.2022.03.07.15.42.31; Mon, 07 Mar 2022 15:42:48 -0800 (PST) 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="dwdfiGh/"; 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 S236774AbiCGKdD (ORCPT + 99 others); Mon, 7 Mar 2022 05:33:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242099AbiCGKLO (ORCPT ); Mon, 7 Mar 2022 05:11:14 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8826F8878C; Mon, 7 Mar 2022 01:54:26 -0800 (PST) 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 DA4D2B80E70; Mon, 7 Mar 2022 09:53:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44501C340F3; Mon, 7 Mar 2022 09:53:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646646833; bh=CwRWz1iT0e8U+3QDeSULEs/jxlFAROz4A7uwq2PHYqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dwdfiGh/9KGU2yHLDJ1ZiecIoE8n0lxTzSOyS+wgjf6jaBkfuDcNJ2UvvVoccZZMe wRbNxPu3DtGA66A5UsWSiIsBJPPzXTVtfLuROHDNAVUWBFzPTqAefUismbdsCx4F/1 6vT4vGTNKxaKXz5K6c5UbvD+iw1mJSjloPb8/gys= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot , Eric Dumazet , John Fastabend , Jakub Sitnicki , Daniel Borkmann , Jakub Kicinski Subject: [PATCH 5.16 068/186] bpf, sockmap: Do not ignore orig_len parameter Date: Mon, 7 Mar 2022 10:18:26 +0100 Message-Id: <20220307091655.993706630@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307091654.092878898@linuxfoundation.org> References: <20220307091654.092878898@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 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: Eric Dumazet commit 60ce37b03917e593d8e5d8bcc7ec820773daf81d upstream. Currently, sk_psock_verdict_recv() returns skb->len This is problematic because tcp_read_sock() might have passed orig_len < skb->len, due to the presence of TCP urgent data. This causes an infinite loop from tcp_read_sock() Followup patch will make tcp_read_sock() more robust vs bad actors. Fixes: ef5659280eb1 ("bpf, sockmap: Allow skipping sk_skb parser program") Reported-by: syzbot Signed-off-by: Eric Dumazet Acked-by: John Fastabend Acked-by: Jakub Sitnicki Tested-by: Jakub Sitnicki Acked-by: Daniel Borkmann Link: https://lore.kernel.org/r/20220302161723.3910001-1-eric.dumazet@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/core/skmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -1153,7 +1153,7 @@ static int sk_psock_verdict_recv(read_de struct sk_psock *psock; struct bpf_prog *prog; int ret = __SK_DROP; - int len = skb->len; + int len = orig_len; /* clone here so sk_eat_skb() in tcp_read_sock does not drop our data */ skb = skb_clone(skb, GFP_ATOMIC);