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 6BB3BC47247 for ; Mon, 4 May 2020 19:59:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3C5B320707 for ; Mon, 4 May 2020 19:59:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C5B320707 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 CC9978E007C; Mon, 4 May 2020 15:59:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CA0D78E0058; Mon, 4 May 2020 15:59:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDDF68E007C; Mon, 4 May 2020 15:59:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0085.hostedemail.com [216.40.44.85]) by kanga.kvack.org (Postfix) with ESMTP id A6DB78E0058 for ; Mon, 4 May 2020 15:59:42 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 64BA0160BA for ; Mon, 4 May 2020 19:59:42 +0000 (UTC) X-FDA: 76780101804.28.kiss64_37957db59773e X-HE-Tag: kiss64_37957db59773e X-Filterd-Recvd-Size: 3653 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Mon, 4 May 2020 19:59:41 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id z6so200504plk.10 for ; Mon, 04 May 2020 12:59:40 -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=2HN8tcXcP8sTZ5bpyK/yzSNJcHfHQaQMKR7YqmFkps4=; b=QwhLw9ir8j/ESIfogOkEoaLRaC8HgEO9N16lkOuBaMmyY+SYM11QVb86WimbRuc6Sf SXlGsgjbthiIhArU9/9iOdJ6+7lDhf4GQ4Nu4Qw9gXSDej7Rc/e3s9TC7zyXu7w1LWF3 5BQFYjwEOHhOnnbCo2YI9uDu3TmdtoIVDtBxM2PbM5+NnxTK4YXSb6O94VFDqRP5sJvC i3AzefZdTA3bWMyK6mKVecoDUrmzHy+sJqN0Y8we0uEFhhEFpT1n9tCeQ/m9tj3GvGAA 0Wkp0Pvnw7VOKfFCzLLFdjtuzCVW7lJ4JuOwB7ON8+ID3hVuM90NzQ5A3/9+qaNc20Yv r5HQ== X-Gm-Message-State: AGi0PubeoepM3eRjj/el3wgJ9tMbRnXegZrMssdK+kvFvy+ze7Rb4PKG U3rxCGfpTkHcV1kSTVS6enc= X-Google-Smtp-Source: APiQypKQ32QT2JrrMxB8ivGMiqkf3Ny/hgAQfR22DVkN0RH8YxwDoAr1Z4aoy+5pePZsHy20Hu32cw== X-Received: by 2002:a17:902:728f:: with SMTP id d15mr855258pll.285.1588622379392; Mon, 04 May 2020 12:59:39 -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 j13sm299187pje.1.2020.05.04.12.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 12:59:38 -0700 (PDT) Received: by 42.do-not-panic.com (Postfix, from userid 1000) id 7416E403EA; Mon, 4 May 2020 19:59:37 +0000 (UTC) Date: Mon, 4 May 2020 19:59:37 +0000 From: Luis Chamberlain To: Kees Cook 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: <20200504195937.GS11244@42.do-not-panic.com> References: <202005041205.C7AF4AF@keescook> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202005041205.C7AF4AF@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 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 crash a system with panic-on-warn. I don't think we want that? Luis