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=-16.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 6D284C4320E for ; Tue, 24 Aug 2021 17:07:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 57B6C61BB1 for ; Tue, 24 Aug 2021 17:07:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239131AbhHXRII (ORCPT ); Tue, 24 Aug 2021 13:08:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:25262 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238637AbhHXRGV (ORCPT ); Tue, 24 Aug 2021 13:06:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629824736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=olgu31rPJpOTjKmA0XuNHPckB19mLh5v5zVaEM4u+Ik=; b=YmKO9pCAtaQDRZDfawH2Y+1YksH1krnVgvfX4eUtYT0TAjEwsF5xoDAe5HqaL3xZyFIpR7 MlDJtzi32aKEq0ZTKnXNjRFTw0Gzeiv5VvM89spHC9iI8g6Gs5/fMcdO5T0i+r6vcic4SM NdNgK+iCQIgg7XdgSBLjcjRsTZTMJ/c= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-2UAZdU3fOECLVghCqdMcMg-1; Tue, 24 Aug 2021 13:05:34 -0400 X-MC-Unique: 2UAZdU3fOECLVghCqdMcMg-1 Received: by mail-qt1-f198.google.com with SMTP id x11-20020ac86b4b000000b00299d7592d31so10993892qts.0 for ; Tue, 24 Aug 2021 10:05:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:organization:user-agent:mime-version :content-transfer-encoding; bh=olgu31rPJpOTjKmA0XuNHPckB19mLh5v5zVaEM4u+Ik=; b=XKkyaIq1hRPeWpTgHmSQOQnnM/K/FM2o1g6bv+sQnRAQyLGQQrR/atYPGwUebjeBcc 5xoZgJmjiOHv50L+1MZuoQiPUVhbmY5Rx1qUapTc3exoScRKFbs3+1UFbyOBPrhsQMqb sfR5yQZDxFz2skxWMJQmiwbEPGRMSFsnv0i9ABAj8BR2Gv9eAs5g+8wlqqFFqdFZ8UWL RK/kcF6L5OS+Lal8Q5H3FnwSSr9ZReJjt6TO8b9EgZLsNT2dgqTLl/tVtsbnkTlKLmgf iX89I0gQlZRzQqZY9YIN7TxrYU6zhtZyvt1xRno76l7v5CMBz6hCzWiFJPvZoOrVRF45 QVxg== X-Gm-Message-State: AOAM531MoTOePDbQNPE7rpQHMayX62aiZnXSbUvRrNTKpZQp6L4qYelf vey3WHqT/tGNuTlIRfcUUrqq1cxYaGPFEndr3Czl2QISIfRbXsEulf0UNgnzLjElc4dYgP6GzyL Pmg/Bk33sSc3Wy7tA X-Received: by 2002:a05:620a:4092:: with SMTP id f18mr8019839qko.91.1629824734236; Tue, 24 Aug 2021 10:05:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxajLXqKsquojFZCdfXxxcf5UjL2aIS6hN3ktbx8HCAz+n/TGk51Sc0c7p6Ra/u9YDvfBY57w== X-Received: by 2002:a05:620a:4092:: with SMTP id f18mr8019822qko.91.1629824734045; Tue, 24 Aug 2021 10:05:34 -0700 (PDT) Received: from [192.168.8.104] (pool-108-49-102-102.bstnma.fios.verizon.net. [108.49.102.102]) by smtp.gmail.com with ESMTPSA id y67sm11309477qkd.58.2021.08.24.10.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 10:05:33 -0700 (PDT) Message-ID: <75ccbdea6e8871856002edb75dff1a32822a5a89.camel@redhat.com> Subject: Re: [PATCH AUTOSEL 4.14 6/7] drm/nouveau: block a bunch of classes from userspace From: Lyude Paul To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ben Skeggs , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Date: Tue, 24 Aug 2021 13:05:32 -0400 In-Reply-To: <20210824005528.631702-6-sashal@kernel.org> References: <20210824005528.631702-1-sashal@kernel.org> <20210824005528.631702-6-sashal@kernel.org> Organization: Red Hat Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.4 (3.40.4-1.fc34) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This isn't at all intended to be a fix to be backported, so I don't think this should be included. I don't know about 5/7, but I'll let Benjamin comment on that one On Mon, 2021-08-23 at 20:55 -0400, Sasha Levin wrote: > From: Ben Skeggs > > [ Upstream commit 148a8653789c01f159764ffcc3f370008966b42f ] > > Long ago, there had been plans for making use of a bunch of these APIs > from userspace and there's various checks in place to stop misbehaving. > > Countless other projects have occurred in the meantime, and the pieces > didn't finish falling into place for that to happen. > > They will (hopefully) in the not-too-distant future, but it won't look > quite as insane.  The super checks are causing problems right now, and > are going to be removed. > > Signed-off-by: Ben Skeggs > Reviewed-by: Lyude Paul > Signed-off-by: Sasha Levin > --- >  drivers/gpu/drm/nouveau/include/nvif/cl0080.h |  3 +- >  drivers/gpu/drm/nouveau/nouveau_drm.c         |  1 + >  drivers/gpu/drm/nouveau/nouveau_usif.c        | 57 ++++++++++++++----- >  .../gpu/drm/nouveau/nvkm/engine/device/user.c |  2 +- >  4 files changed, 48 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h > b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h > index 2740278d226b..61c17acd507c 100644 > --- a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h > +++ b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h > @@ -4,7 +4,8 @@ >   >  struct nv_device_v0 { >         __u8  version; > -       __u8  pad01[7]; > +       __u8  priv; > +       __u8  pad02[6]; >         __u64 device;   /* device identifier, ~0 for client default */ >  }; >   > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c > b/drivers/gpu/drm/nouveau/nouveau_drm.c > index fb6b1d0f7fef..fc54a26598cc 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > @@ -151,6 +151,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char > *sname, >         ret = nvif_device_init(&cli->base.object, 0, NV_DEVICE, >                                &(struct nv_device_v0) { >                                         .device = ~0, > +                                       .priv = true, >                                }, sizeof(struct nv_device_v0), >                                &cli->device); >         if (ret) { > diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.c > b/drivers/gpu/drm/nouveau/nouveau_usif.c > index 9dc10b17ad34..5da1f4d223d7 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_usif.c > +++ b/drivers/gpu/drm/nouveau/nouveau_usif.c > @@ -32,6 +32,9 @@ >  #include >  #include >   > +#include > +#include > + >  struct usif_notify_p { >         struct drm_pending_event base; >         struct { > @@ -261,7 +264,7 @@ usif_object_dtor(struct usif_object *object) >  } >   >  static int > -usif_object_new(struct drm_file *f, void *data, u32 size, void *argv, u32 > argc) > +usif_object_new(struct drm_file *f, void *data, u32 size, void *argv, u32 > argc, bool parent_abi16) >  { >         struct nouveau_cli *cli = nouveau_cli(f); >         struct nvif_client *client = &cli->base; > @@ -271,23 +274,48 @@ usif_object_new(struct drm_file *f, void *data, u32 > size, void *argv, u32 argc) >         struct usif_object *object; >         int ret = -ENOSYS; >   > +       if ((ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) > +               return ret; > + > +       switch (args->v0.oclass) { > +       case NV_DMA_FROM_MEMORY: > +       case NV_DMA_TO_MEMORY: > +       case NV_DMA_IN_MEMORY: > +               return -EINVAL; > +       case NV_DEVICE: { > +               union { > +                       struct nv_device_v0 v0; > +               } *args = data; > + > +               if ((ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, > false))) > +                       return ret; > + > +               args->v0.priv = false; > +               break; > +       } > +       default: > +               if (!parent_abi16) > +                       return -EINVAL; > +               break; > +       } > + >         if (!(object = kmalloc(sizeof(*object), GFP_KERNEL))) >                 return -ENOMEM; >         list_add(&object->head, &cli->objects); >   > -       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) { > -               object->route = args->v0.route; > -               object->token = args->v0.token; > -               args->v0.route = NVDRM_OBJECT_USIF; > -               args->v0.token = (unsigned long)(void *)object; > -               ret = nvif_client_ioctl(client, argv, argc); > -               args->v0.token = object->token; > -               args->v0.route = object->route; > +       object->route = args->v0.route; > +       object->token = args->v0.token; > +       args->v0.route = NVDRM_OBJECT_USIF; > +       args->v0.token = (unsigned long)(void *)object; > +       ret = nvif_client_ioctl(client, argv, argc); > +       if (ret) { > +               usif_object_dtor(object); > +               return ret; >         } >   > -       if (ret) > -               usif_object_dtor(object); > -       return ret; > +       args->v0.token = object->token; > +       args->v0.route = object->route; > +       return 0; >  } >   >  int > @@ -301,6 +329,7 @@ usif_ioctl(struct drm_file *filp, void __user *user, u32 > argc) >                 struct nvif_ioctl_v0 v0; >         } *argv = data; >         struct usif_object *object; > +       bool abi16 = false; >         u8 owner; >         int ret; >   > @@ -331,11 +360,13 @@ usif_ioctl(struct drm_file *filp, void __user *user, > u32 argc) >                         mutex_unlock(&cli->mutex); >                         goto done; >                 } > + > +               abi16 = true; >         } >   >         switch (argv->v0.type) { >         case NVIF_IOCTL_V0_NEW: > -               ret = usif_object_new(filp, data, size, argv, argc); > +               ret = usif_object_new(filp, data, size, argv, argc, abi16); >                 break; >         case NVIF_IOCTL_V0_NTFY_NEW: >                 ret = usif_notify_new(filp, data, size, argv, argc); > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c > b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c > index 513ee6b79553..08100eed9584 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c > @@ -347,7 +347,7 @@ nvkm_udevice_new(const struct nvkm_oclass *oclass, void > *data, u32 size, >                 return ret; >   >         /* give priviledged clients register access */ > -       if (client->super) > +       if (args->v0.priv) >                 func = &nvkm_udevice_super; >         else >                 func = &nvkm_udevice; -- Cheers, Lyude Paul (she/her) Software Engineer at Red Hat