Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp624883ybe; Thu, 5 Sep 2019 03:24:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqwA7E535yRZRd1OFjYupJnKz56QkGb19EwpSV4TGObd2XMJ28kxmcuc7IftH/+2QCi0LLvx X-Received: by 2002:a63:fc52:: with SMTP id r18mr2473363pgk.378.1567679042121; Thu, 05 Sep 2019 03:24:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567679042; cv=none; d=google.com; s=arc-20160816; b=00tVNIMI/jFZ3xfU1q9c/pwzuGdq7IWsS9gEyLWKlQScdAo1UWKNGbAAryCE11tAZo ai3g74ZxLHuHFQd6LITeWFl9DnaPSvmnm7r2/MzDakywEqvCLL+gwVwAZQFvuqzwa6w8 /unENtSS7g/ArBIJWKpb2nZEXksv8b8QPvEIIsz7wE0zq9IjmZ8tMYanXeH1tfZGeXnm GI0lyHAcTa2RtvDnFDJQbtsiB2pUmrP6OqVuHgEifFBSGo+DIa/goXV4vvcBsElc5uxn 5JLMTANaUz7B21IVDXMZeE1sRVMgn6dh2VClxQc4XhTjKL0QreayUfGkZ5jO1eUTq/zt GI0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=DWu3Q3NsRECeMz6ADnEG1ojCrtEOLyNfb/ACnoXm+5c=; b=hr9lwwyvKM0FXjnMEW6wljw2ZxHwJMeI889nxOuk2acnqVFrTHgKgPBrFgkoTB6Igc JIfSznrJVrDsAiv9P+B96dvp1TwzbgQo+7RyLLM47UMDzrgtJHNl2f+y82Ixb9ZdHnaL SypIL9gu7s/ixVNQLBgnEZQAD2sApd5MJLpm1rYf5JO65UXwU0Ropg3kc5d+uKEz0iGp NyZ3hSuQMW5ZFoPDaWy6ghWZoEY5QFuO2TAYp0Hw8C5bkOez3Z+GjQXvt9twfe8rvZKE vuIfkMHyz+gE+pStldKAgoJLmvztOLCMw1eGNIaq8lDjNa0Od9L00rbRYEAiqjyHiteG jFzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=ImBcjvSv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e3si1653985pjr.26.2019.09.05.03.23.46; Thu, 05 Sep 2019 03:24:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=ImBcjvSv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387572AbfIEJnf (ORCPT + 99 others); Thu, 5 Sep 2019 05:43:35 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:32836 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730864AbfIEJne (ORCPT ); Thu, 5 Sep 2019 05:43:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Transfer-Encoding :Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Sender:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=DWu3Q3NsRECeMz6ADnEG1ojCrtEOLyNfb/ACnoXm+5c=; b=ImBcjvSvVTBTF82cJnHkMMRzrc wXs47F+KUma80Too+wdb1/cuTXpEqgh8KRzuCkRlZ0fr8yd+rGV11vtFCXEpHIfXsSSMxYgZq+BZe j9hOciSoj9KbN1RDyoNh/jmFEUQdIQmF6hYpVWzn06ajMSVuOdhzmkolQinSB0f/P9y+ggH0M05EL Ep0WDqXga/kgncTA7qtrIoeV3cTuOQsKwRc3GyDb7awLVddyhhTZ1f+jUhojDLgE8Z+t5KKNVCssQ gIDi5af1/kaAWfewsPYaMe+dl+bjKEOKCmMsxe/kBq9YQ7mxqicbVbrHt252m2Zdbtdd+DYc8ZKSV ZSQ5qyog==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1i5oII-0008Hm-Ap; Thu, 05 Sep 2019 09:43:11 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id DE6893011DF; Thu, 5 Sep 2019 11:42:28 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id B5FA420D8627E; Thu, 5 Sep 2019 11:43:05 +0200 (CEST) Date: Thu, 5 Sep 2019 11:43:05 +0200 From: Peter Zijlstra To: Aleksa Sarai Cc: Al Viro , Jeff Layton , "J. Bruce Fields" , Arnd Bergmann , David Howells , Shuah Khan , Shuah Khan , Ingo Molnar , Christian Brauner , Rasmus Villemoes , Eric Biederman , Andy Lutomirski , Andrew Morton , Alexei Starovoitov , Kees Cook , Jann Horn , Tycho Andersen , David Drysdale , Chanho Min , Oleg Nesterov , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Aleksa Sarai , Linus Torvalds , containers@lists.linux-foundation.org, linux-alpha@vger.kernel.org, linux-api@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-xtensa@linux-xtensa.org, sparclinux@vger.kernel.org Subject: Re: [PATCH v12 01/12] lib: introduce copy_struct_{to,from}_user helpers Message-ID: <20190905094305.GJ2349@hirez.programming.kicks-ass.net> References: <20190904201933.10736-1-cyphar@cyphar.com> <20190904201933.10736-2-cyphar@cyphar.com> <20190905073205.GY2332@hirez.programming.kicks-ass.net> <20190905092622.tlb6nn3uisssdfbu@yavin.dot.cyphar.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20190905092622.tlb6nn3uisssdfbu@yavin.dot.cyphar.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 05, 2019 at 07:26:22PM +1000, Aleksa Sarai wrote: > On 2019-09-05, Peter Zijlstra wrote: > > On Thu, Sep 05, 2019 at 06:19:22AM +1000, Aleksa Sarai wrote: > > > +/** > > > + * copy_struct_to_user: copy a struct to user space > > > + * @dst: Destination address, in user space. > > > + * @usize: Size of @dst struct. > > > + * @src: Source address, in kernel space. > > > + * @ksize: Size of @src struct. > > > + * > > > + * Copies a struct from kernel space to user space, in a way that gu= arantees > > > + * backwards-compatibility for struct syscall arguments (as long as = future > > > + * struct extensions are made such that all new fields are *appended= * to the > > > + * old struct, and zeroed-out new fields have the same meaning as th= e old > > > + * struct). > > > + * > > > + * @ksize is just sizeof(*dst), and @usize should've been passed by = user space. > > > + * The recommended usage is something like the following: > > > + * > > > + * SYSCALL_DEFINE2(foobar, struct foo __user *, uarg, size_t, usiz= e) > > > + * { > > > + * int err; > > > + * struct foo karg =3D {}; > > > + * > > > + * // do something with karg > > > + * > > > + * err =3D copy_struct_to_user(uarg, usize, &karg, sizeof(karg)= ); > > > + * if (err) > > > + * return err; > > > + * > > > + * // ... > > > + * } > > > + * > > > + * There are three cases to consider: > > > + * * If @usize =3D=3D @ksize, then it's copied verbatim. > > > + * * If @usize < @ksize, then kernel space is "returning" a newer s= truct to an > > > + * older user space. In order to avoid user space getting incompl= ete > > > + * information (new fields might be important), all trailing byte= s in @src > > > + * (@ksize - @usize) must be zerored > >=20 > > s/zerored/zero/, right? >=20 > It should've been "zeroed". That reads wrong to me; that way it reads like this function must take that action and zero out the 'rest'; which is just wrong. This function must verify those bytes are zero, not make them zero. > > > , otherwise -EFBIG is return= ed. > >=20 > > 'Funny' that, copy_struct_from_user() below seems to use E2BIG. >=20 > This is a copy of the semantics that sched_[sg]etattr(2) uses -- E2BIG for > a "too big" struct passed to the kernel, and EFBIG for a "too big" > struct passed to user-space. I would personally have preferred EMSGSIZE > instead of EFBIG, but felt using the existing error codes would be less > confusing. Sadly a recent commit: 1251201c0d34 ("sched/core: Fix uclamp ABI bug, clean up and robustify sch= ed_read_attr() ABI logic and code") Made the situation even 'worse'. > > > + if (unlikely(!access_ok(src, usize))) > > > + return -EFAULT; > > > + > > > + /* Deal with trailing bytes. */ > > > + if (usize < ksize) > > > + memset(dst + size, 0, rest); > > > + else if (usize > ksize) { > > > + const void __user *addr =3D src + size; > > > + char buffer[BUFFER_SIZE] =3D {}; > >=20 > > Isn't that too big for on-stack? >=20 > Is a 64-byte buffer too big? I picked the number "at random" to be the > size of a cache line, but I could shrink it down to 32 bytes if the size > is an issue (I wanted to avoid needless allocations -- hence it being > on-stack). Ah, my ctags gave me a definition of BUFFER_SIZE that was 512. I suppose 64 should be OK. > > > + > > > + while (rest > 0) { > > > + size_t bufsize =3D min(rest, sizeof(buffer)); > > > + > > > + if (__copy_from_user(buffer, addr, bufsize)) > > > + return -EFAULT; > > > + if (memchr_inv(buffer, 0, bufsize)) > > > + return -E2BIG; > > > + > > > + addr +=3D bufsize; > > > + rest -=3D bufsize; > > > + } > >=20 > > The perf implementation uses get_user(); but if that is too slow, surely > > we can do something with uaccess_try() here? >=20 > Is there a non-x86-specific way to do that (unless I'm mistaken only x86 > has uaccess_try() or the other *_try() wrappers)? The main "performance > improvement" (if you can even call it that) is that we use memchr_inv() > which finds non-matching characters more efficiently than just doing a > loop. Oh, you're right, that's x86 only :/