Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1797949pxp; Mon, 7 Mar 2022 02:35:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwrMLAmobZyEXHp2PLhQPs7VKGkHTCL/1OYnTx+ZJeGzZf+OGldjt1g4SLtdTSKYENGKcWS X-Received: by 2002:a17:90a:bf91:b0:1b9:bda3:10ff with SMTP id d17-20020a17090abf9100b001b9bda310ffmr12113411pjs.38.1646649301017; Mon, 07 Mar 2022 02:35:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646649301; cv=none; d=google.com; s=arc-20160816; b=KWSRzUrz2xVzqNKPUoLOtG+l0dwof4VWgJOy0NAal709IIlxdag/k69akYiLBT5md0 WGULKsiDEAcgwzPXC07vjj0SU5aK6oGCrn3dS1nIn2DlIL1iloVavTcEe6G8Ki8Ys8pT LBqGYoBA2etdmYtx4OwcELKHhRTMyDBt0b1B8xsK/41MzO8bTBmFsEHYf2Jk/zeo+10N cbsRjj8/llpxCYdwQ52kMDYJm6xZ7sN7tTcFqOazJ8GrB/6xTO/3R4b8KsdlZluJNkkJ 21PSZH8W2+gckeD5YbbKXFxtnsAgIgklY8eUfqXpRfcsoD6Rl3ZYqa9b/dXZ8t1nWqtG 1+JQ== 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=NrMtnHkXieIFBabatFImLiEN7hcvldYPV4sDMx0BaBk7VsjOM4MrGx1yBNv13BIUXz xAZSXWd+WyWTTrslNwg5futcsJCMa+Be56V4w2CqWSKpHmyo89Iyi+mnjj9Ekdu4tL7z kdjNB+peWzh9J5Giy/Kf7HyG7pzK0qCbFp09xkcXoIo8T99kHc/ZrdLgF7L8AuSRevHf qa3ztaJVFVvjj/vu89r4aacHBQbopNue7asPtwUSk7NbgZHBH7nuC/Q/A0TGQ5oAn7x+ zkDvkiE+D/fMuh8gdwHCwJDu4vZVMwO1etwo+qdSMenZYjaDUYkgdp+H3V2qR5dnVfXK A4KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bWfALnZ0; 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 k9-20020a17090a514900b001bd14e030a6si447387pjm.126.2022.03.07.02.34.46; Mon, 07 Mar 2022 02:35:00 -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=bWfALnZ0; 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 S236213AbiCGKHn (ORCPT + 99 others); Mon, 7 Mar 2022 05:07:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239309AbiCGJta (ORCPT ); Mon, 7 Mar 2022 04:49:30 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC83F2C11D; Mon, 7 Mar 2022 01:42:58 -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 dfw.source.kernel.org (Postfix) with ESMTPS id D773160C7D; Mon, 7 Mar 2022 09:42:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDCF5C340E9; Mon, 7 Mar 2022 09:42:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646646168; bh=CwRWz1iT0e8U+3QDeSULEs/jxlFAROz4A7uwq2PHYqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bWfALnZ0rhIik1kIBpAQ0ZCMpol63qZ+Pe37e/YRl3RAJV5kDRRxkGAnnDp1Ya+T5 TiuBln/ksIbyqi0rH7vjGI/96J1gAXD3Cg2srpTpPlkUWS9fWOcl68PZOGiakuny8T KxTddlXacK4HEBB5gA0Vk7sKnHPvX+xcSAiJ1Fu8= 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.15 155/262] bpf, sockmap: Do not ignore orig_len parameter Date: Mon, 7 Mar 2022 10:18:19 +0100 Message-Id: <20220307091706.810903558@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307091702.378509770@linuxfoundation.org> References: <20220307091702.378509770@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);