From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63B38C43381 for ; Tue, 12 Mar 2019 18:04:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A20D21773 for ; Tue, 12 Mar 2019 18:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552413848; bh=0SoUTuN3P5J55ngqJwQFbuzt6wrt5yNt2TWQ53ezmIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SLYDShJW6hXtRss0RG0+C3L2xjt0NdRKaaYe/QotHBZqVLQt7rRdWY5M2nvgl4kjD aPwdJdiIQbvpZGzIdWu1bwivLcNtsDAIMYcXKznuDAv4rOdvAt3N4mdlayoBX1nzyS aIcKZCQtztTbQIwG/YEbFApOpfXRemRPst0KI+rQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727797AbfCLSDz (ORCPT ); Tue, 12 Mar 2019 14:03:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:48810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727665AbfCLRMw (ORCPT ); Tue, 12 Mar 2019 13:12:52 -0400 Received: from localhost (unknown [104.133.8.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 753962177E; Tue, 12 Mar 2019 17:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410771; bh=0SoUTuN3P5J55ngqJwQFbuzt6wrt5yNt2TWQ53ezmIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G+kp46844Z7zIOkD/lL1d/X2YlNbf4YErysAKbDePQyYvLLU9ILoBgOf90IqbwMYt 2Zjw25n1hlwRg/PoPtvlPKDB7xZhZ1zpsXqJUQ4qi7kI4CHoACPz+rIw7Hb1GPT7K2 bxFG+u+BSB7RSNA1K/E7tRzwMpW4Irnp6p7OCLOQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yafang Shao , Martin KaFai Lau , Lawrence Brakmo , Daniel Borkmann , Sasha Levin Subject: [PATCH 4.20 087/171] bpf: sock recvbuff must be limited by rmem_max in bpf_setsockopt() Date: Tue, 12 Mar 2019 10:07:47 -0700 Message-Id: <20190312170355.484082017@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312170347.868927101@linuxfoundation.org> References: <20190312170347.868927101@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c9e4576743eeda8d24dedc164d65b78877f9a98c ] When sock recvbuff is set by bpf_setsockopt(), the value must by limited by rmem_max. It is the same with sendbuff. Fixes: 8c4b4c7e9ff0 ("bpf: Add setsockopt helper function to bpf") Signed-off-by: Yafang Shao Acked-by: Martin KaFai Lau Acked-by: Lawrence Brakmo Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- net/core/filter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/core/filter.c b/net/core/filter.c index 16350f8c8815..821050957aca 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3927,10 +3927,12 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock, /* Only some socketops are supported */ switch (optname) { case SO_RCVBUF: + val = min_t(u32, val, sysctl_rmem_max); sk->sk_userlocks |= SOCK_RCVBUF_LOCK; sk->sk_rcvbuf = max_t(int, val * 2, SOCK_MIN_RCVBUF); break; case SO_SNDBUF: + val = min_t(u32, val, sysctl_wmem_max); sk->sk_userlocks |= SOCK_SNDBUF_LOCK; sk->sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF); break; -- 2.19.1