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=-8.5 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 A585CC47247 for ; Mon, 4 May 2020 21:59:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 73ACE2073E for ; Mon, 4 May 2020 21:59:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 73ACE2073E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 03C438E0084; Mon, 4 May 2020 17:59:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F2E318E0058; Mon, 4 May 2020 17:59:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1CC38E0084; Mon, 4 May 2020 17:59:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0147.hostedemail.com [216.40.44.147]) by kanga.kvack.org (Postfix) with ESMTP id C6C2C8E0058 for ; Mon, 4 May 2020 17:59:06 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 82236181AEF1A for ; Mon, 4 May 2020 21:59:06 +0000 (UTC) X-FDA: 76780402692.25.frame48_4f7d17d63d05a X-HE-Tag: frame48_4f7d17d63d05a X-Filterd-Recvd-Size: 4481 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Mon, 4 May 2020 21:59:06 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id x77so107423pfc.0 for ; Mon, 04 May 2020 14:59:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=9oGAxfJ31YDqUrHQ7flisYymPnWje1IHIwZimDQO4UU=; b=dd4EVxGDd61gJqGudGygvtbb0l2bRsusepPY2cGVhvyxo1886enrLnkPff0lx6bKZ7 NwL0TbsluxrpPy+uIF7tC6S1da77naHIzFg7qGIsdJ6KoAbE5b0Ldo+wAKV2uCSTRgAr 7obfoXvBFxFoyJLw1DhLzJrB8qKFYu6g8QZhI8InQu6RKNOYlsPP11Jts67m5MnxxjYO hWTh8r90SOjfSHab1VNjLfUtVRCpEeL8ZsMV+/DJpeRbxatv2Dxrx7oZc3S5yfN+AtUg 6EfUdGTMCcMtZL/ZY6HCio0dRsCOojrTXicAJh3PJ9+Wq5NNOEN1hs9S2Eu3fxX1bGz6 AW0g== X-Gm-Message-State: AGi0PuYBTvH4/GjZ9q1vFgh3CR8PO+uwrSofryLqedJFTXLK8HFPLpiW n97BuMvzQHQC/Nvtd+p2HTM= X-Google-Smtp-Source: APiQypLULqzB9DO3Xon+UOV9dq9Wzzr80GGKDKMfMwtr6KGaykpNjr9vUL3nYX52F6TTo7p4VCsCFg== X-Received: by 2002:a63:6747:: with SMTP id b68mr319344pgc.142.1588629545107; Mon, 04 May 2020 14:59:05 -0700 (PDT) Received: from 42.do-not-panic.com (42.do-not-panic.com. [157.230.128.187]) by smtp.gmail.com with ESMTPSA id r128sm50579pfc.141.2020.05.04.14.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 14:59:03 -0700 (PDT) Received: by 42.do-not-panic.com (Postfix, from userid 1000) id 43401403EA; Mon, 4 May 2020 21:59:03 +0000 (UTC) Date: Mon, 4 May 2020 21:59:03 +0000 From: Luis Chamberlain To: Kees Cook , Greg KH Cc: Christoph Hellwig , Iurii Zaikin , Alexey Dobriyan , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] sysctl: Make sure proc handlers can't expose heap memory Message-ID: <20200504215903.GT11244@42.do-not-panic.com> References: <202005041205.C7AF4AF@keescook> <20200504195937.GS11244@42.do-not-panic.com> <202005041329.169799C65D@keescook> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202005041329.169799C65D@keescook> User-Agent: Mutt/1.10.1 (2018-07-13) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, May 04, 2020 at 01:32:07PM -0700, Kees Cook wrote: > On Mon, May 04, 2020 at 07:59:37PM +0000, Luis Chamberlain wrote: > > On Mon, May 04, 2020 at 12:08:55PM -0700, Kees Cook wrote: > > > Just as a precaution, make sure that proc handlers don't accidentally > > > grow "count" beyond the allocated kbuf size. > > > > > > Signed-off-by: Kees Cook > > > --- > > > This applies to hch's sysctl cleanup tree... > > > --- > > > fs/proc/proc_sysctl.c | 3 +++ > > > 1 file changed, 3 insertions(+) > > > > > > diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c > > > index 15030784566c..535ab26473af 100644 > > > --- a/fs/proc/proc_sysctl.c > > > +++ b/fs/proc/proc_sysctl.c > > > @@ -546,6 +546,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, > > > struct inode *inode = file_inode(filp); > > > struct ctl_table_header *head = grab_header(inode); > > > struct ctl_table *table = PROC_I(inode)->sysctl_entry; > > > + size_t count_max = count; > > > void *kbuf; > > > ssize_t error; > > > > > > @@ -590,6 +591,8 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, > > > > > > if (!write) { > > > error = -EFAULT; > > > + if (WARN_ON(count > count_max)) > > > + count = count_max; > > > > That would crash a system with panic-on-warn. I don't think we want that? > > Eh? None of the handlers should be making this mistake currently and > it's not a mistake that can be controlled from userspace. WARN() is > absolutely what's wanted here: report an impossible situation (and > handle it gracefully for the bulk of users that don't have > panic_on_warn set). Alrighty, Greg are you OK with this type of WARN_ON()? You recently expressed concerns over its use due to panic-on-warn on another patch. LUis