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=-3.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 F0CBDC433E0 for ; Thu, 11 Jun 2020 23:23:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C68202078C for ; Thu, 11 Jun 2020 23:23:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Im7VtVIh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726445AbgFKXXN (ORCPT ); Thu, 11 Jun 2020 19:23:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726364AbgFKXXM (ORCPT ); Thu, 11 Jun 2020 19:23:12 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4CEAC08C5C2 for ; Thu, 11 Jun 2020 16:23:12 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id m2so3024349pjv.2 for ; Thu, 11 Jun 2020 16:23:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=dF5S2dn2pVgES3YrOEuT/txRTXS0NkdBy5TQaEH6DIU=; b=Im7VtVIhpDqHDj91TB7IHzCdVnA7cfAKvscZOGBTPVCyTJytRbl+ab1O58LQFqAHOi U4CzwwHUZnlrb8MvXGRZ430PTCx5cAFj98PV4U2LQtuIFjbr8XzRxz5SIGSuj3FBGQDo ASsFRokK8d6OyeBDvWzybCftl71yZ/TTfnUO0= 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; bh=dF5S2dn2pVgES3YrOEuT/txRTXS0NkdBy5TQaEH6DIU=; b=UC3WngnH1qIVVScPgEEBuJilA8Lm2iwV84Da5HEn4NuOHQLXHfxz23qwT+4Gdi4Y78 seGl48cvmf73hVTV+2tni4jgf1qMVXj1ZYrUWwfnUtVLxfAyius4xwzV/0w3RabzKong XCGLHlg0/dKrd0elKTnfEzWK6JPQRS1Dh22aCKiehk+hwfLgFTr1URh42u27Grsa5KLU VW9zBpheyLQftyuPM2CwKUgMEUf0M8B5MtBNv35EnP5SH2ontWWnYahP+Wd0q6I5jGwU 3l9ibhX8SuGIob02eYhDc6x3CZJSYA4Q/4/bYEqahUAf5AnAtBr7QZKuGRFAte9gQdGr l8zQ== X-Gm-Message-State: AOAM533lVOqEk781WU1uA5I2k4i8jlzJGJxCPClfZPQGw/na4RcNyVpK F+a8MeHdzvEb2oCa4hg9T8jPoA== X-Google-Smtp-Source: ABdhPJwTmpa2kzC8wDU5aCXCVkPVDsBffhaUPbr0t/XzzYQF4UVcbOpP5W8PS0r8XWx0KOQrRuCd8A== X-Received: by 2002:a17:902:c214:: with SMTP id 20mr9177825pll.193.1591917792301; Thu, 11 Jun 2020 16:23:12 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id d189sm4120162pfc.51.2020.06.11.16.23.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 16:23:11 -0700 (PDT) Date: Thu, 11 Jun 2020 16:23:10 -0700 From: Kees Cook To: Sargun Dhillon Cc: Christian Brauner , containers@lists.linux-foundation.org, Giuseppe Scrivano , Robert Sesek , Chris Palmer , Jann Horn , Greg Kroah-Hartman , Daniel Wagner , linux-kernel@vger.kernel.org, Matt Denton , John Fastabend , linux-fsdevel@vger.kernel.org, Tejun Heo , Al Viro , cgroups@vger.kernel.org, stable@vger.kernel.org, "David S . Miller" Subject: Re: [PATCH v3 1/4] fs, net: Standardize on file_receive helper to move fds across processes Message-ID: <202006111622.01F596D@keescook> References: <20200605075435.GA3345@ircssh-2.c.rugged-nimbus-611.internal> <202006091235.930519F5B@keescook> <20200609200346.3fthqgfyw3bxat6l@wittgenstein> <202006091346.66B79E07@keescook> <037A305F-B3F8-4CFA-B9F8-CD4C9EF9090B@ubuntu.com> <202006092227.D2D0E1F8F@keescook> <20200610081237.GA23425@ircssh-2.c.rugged-nimbus-611.internal> <202006101953.899EFB53@keescook> <20200611091942.jni2glnpmxisnant@wittgenstein> <20200611103922.GA30103@ircssh-2.c.rugged-nimbus-611.internal> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200611103922.GA30103@ircssh-2.c.rugged-nimbus-611.internal> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Thu, Jun 11, 2020 at 10:39:23AM +0000, Sargun Dhillon wrote: > On Thu, Jun 11, 2020 at 11:19:42AM +0200, Christian Brauner wrote: > > On Wed, Jun 10, 2020 at 07:59:55PM -0700, Kees Cook wrote: > > > On Wed, Jun 10, 2020 at 08:12:38AM +0000, Sargun Dhillon wrote: > > > > As an aside, all of this junk should be dropped: > > > > + ret = get_user(size, &uaddfd->size); > > > > + if (ret) > > > > + return ret; > > > > + > > > > + ret = copy_struct_from_user(&addfd, sizeof(addfd), uaddfd, size); > > > > + if (ret) > > > > + return ret; > > > > > > > > and the size member of the seccomp_notif_addfd struct. I brought this up > > > > off-list with Tycho that ioctls have the size of the struct embedded in them. We > > > > should just use that. The ioctl definition is based on this[2]: > > > > #define _IOC(dir,type,nr,size) \ > > > > (((dir) << _IOC_DIRSHIFT) | \ > > > > ((type) << _IOC_TYPESHIFT) | \ > > > > ((nr) << _IOC_NRSHIFT) | \ > > > > ((size) << _IOC_SIZESHIFT)) > > > > > > > > > > > > We should just use copy_from_user for now. In the future, we can either > > > > introduce new ioctl names for new structs, or extract the size dynamically from > > > > the ioctl (and mask it out on the switch statement in seccomp_notify_ioctl. > > > > > > Yeah, that seems reasonable. Here's the diff for that part: > > > > > > diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h > > > index 7b6028b399d8..98bf19b4e086 100644 > > > --- a/include/uapi/linux/seccomp.h > > > +++ b/include/uapi/linux/seccomp.h > > > @@ -118,7 +118,6 @@ struct seccomp_notif_resp { > > > > > > /** > > > * struct seccomp_notif_addfd > > > - * @size: The size of the seccomp_notif_addfd datastructure > > > * @id: The ID of the seccomp notification > > > * @flags: SECCOMP_ADDFD_FLAG_* > > > * @srcfd: The local fd number > > > @@ -126,7 +125,6 @@ struct seccomp_notif_resp { > > > * @newfd_flags: The O_* flags the remote FD should have applied > > > */ > > > struct seccomp_notif_addfd { > > > - __u64 size; > > > __u64 id; > > > __u32 flags; > > > __u32 srcfd; > > > diff --git a/kernel/seccomp.c b/kernel/seccomp.c > > > index 3c913f3b8451..00cbdad6c480 100644 > > > --- a/kernel/seccomp.c > > > +++ b/kernel/seccomp.c > > > @@ -1297,14 +1297,9 @@ static long seccomp_notify_addfd(struct seccomp_filter *filter, > > > struct seccomp_notif_addfd addfd; > > > struct seccomp_knotif *knotif; > > > struct seccomp_kaddfd kaddfd; > > > - u64 size; > > > int ret; > > > > > > - ret = get_user(size, &uaddfd->size); > > > - if (ret) > > > - return ret; > > > - > > > - ret = copy_struct_from_user(&addfd, sizeof(addfd), uaddfd, size); > > > + ret = copy_from_user(&addfd, uaddfd, sizeof(addfd)); > > > if (ret) > > > return ret; > > > > > > > > > > > > > > ---- > > > > +#define SECCOMP_IOCTL_NOTIF_ADDFD SECCOMP_IOR(3, \ > > > > + struct seccomp_notif_addfd) > > > > > > > > Lastly, what I believe to be a small mistake, it should be SECCOMP_IOW, based on > > > > the documentation in ioctl.h -- "_IOW means userland is writing and kernel is > > > > reading." > > > > > > Oooooh. Yeah; good catch. Uhm, that means SECCOMP_IOCTL_NOTIF_ID_VALID > > > is wrong too, yes? Tycho, Christian, how disruptive would this be to > > > fix? (Perhaps support both and deprecate the IOR version at some point > > > in the future?) > > > > We have custom defines in our source code, i.e. > > #define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64) > > so ideally we'd have a SECCOMP_IOCTL_NOTIF_ID_VALID_V2 > > > > Does that sound ok? > > > > Christian > Why not change the public API in seccomp.h to: > #define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOW(2, __u64) > > And then in seccomp.c: > #define SECCOMP_IOCTL_NOTIF_ID_VALID_OLD SECCOMP_IOR(2, __u64) > static long seccomp_notify_ioctl(struct file *file, unsigned int cmd, > unsigned long arg) > { > struct seccomp_filter *filter = file->private_data; > void __user *buf = (void __user *)arg; > > switch (cmd) { > case SECCOMP_IOCTL_NOTIF_RECV: > return seccomp_notify_recv(filter, buf); > case SECCOMP_IOCTL_NOTIF_SEND: > return seccomp_notify_send(filter, buf); > case SECCOMP_IOCTL_NOTIF_ID_VALID_OLD: > pr_warn_once("Detected usage of legacy (incorrect) version of seccomp notifier notif_id_valid ioctl\n"); > case SECCOMP_IOCTL_NOTIF_ID_VALID: > return seccomp_notify_id_valid(filter, buf); > default: > return -EINVAL; > } > } > ---- > > So, both will work fine, and whenevery anyone recompiles, or picks up new > headers, they will start calling the "right" one without a code change, and > we wont break any userspace. Yeah, that's what I'd prefer here. -- Kees Cook