From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kees Cook Subject: Re: [PATCH RESEND 3/4] drm/i915/gem: Replace user_access_begin by user_write_access_begin Date: Thu, 2 Apr 2020 00:52:15 -0700 Message-ID: <202004020051.649C6B8@keescook> References: <27106d62fdbd4ffb47796236050e418131cb837f.1585811416.git.christophe.leroy@c-s.fr> <6da6fa391c0d6344cc9ff99a69fcaa65666f3947.1585811416.git.christophe.leroy@c-s.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-pg1-f193.google.com ([209.85.215.193]:41166 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387403AbgDBHwS (ORCPT ); Thu, 2 Apr 2020 03:52:18 -0400 Received: by mail-pg1-f193.google.com with SMTP id b1so1471461pgm.8 for ; Thu, 02 Apr 2020 00:52:17 -0700 (PDT) Content-Disposition: inline In-Reply-To: <6da6fa391c0d6344cc9ff99a69fcaa65666f3947.1585811416.git.christophe.leroy@c-s.fr> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Christophe Leroy Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , airlied@linux.ie, daniel@ffwll.ch, torvalds@linux-foundation.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, linux-arch@vger.kernel.org On Thu, Apr 02, 2020 at 07:34:18AM +0000, Christophe Leroy wrote: > When i915_gem_execbuffer2_ioctl() is using user_access_begin(), > that's only to perform unsafe_put_user() so use > user_write_access_begin() in order to only open write access. > > Signed-off-by: Christophe Leroy Why is this split from the other conversions? Reviewed-by: Kees Cook > --- > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index 7643a30ba4cd..4be8205a70b6 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -1611,14 +1611,14 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb) > * happened we would make the mistake of assuming that the > * relocations were valid. > */ > - if (!user_access_begin(urelocs, size)) > + if (!user_write_access_begin(urelocs, size)) > goto end; > > for (copied = 0; copied < nreloc; copied++) > unsafe_put_user(-1, > &urelocs[copied].presumed_offset, > end_user); > - user_access_end(); > + user_write_access_end(); > > eb->exec[i].relocs_ptr = (uintptr_t)relocs; > } > @@ -1626,7 +1626,7 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb) > return 0; > > end_user: > - user_access_end(); > + user_write_access_end(); > end: > kvfree(relocs); > err = -EFAULT; > @@ -2991,7 +2991,8 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data, > * And this range already got effectively checked earlier > * when we did the "copy_from_user()" above. > */ > - if (!user_access_begin(user_exec_list, count * sizeof(*user_exec_list))) > + if (!user_write_access_begin(user_exec_list, > + count * sizeof(*user_exec_list))) > goto end; > > for (i = 0; i < args->buffer_count; i++) { > @@ -3005,7 +3006,7 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data, > end_user); > } > end_user: > - user_access_end(); > + user_write_access_end(); > end:; > } > > -- > 2.25.0 > -- Kees Cook From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Thu, 2 Apr 2020 00:52:15 -0700 From: Kees Cook Subject: Re: [PATCH RESEND 3/4] drm/i915/gem: Replace user_access_begin by user_write_access_begin Message-ID: <202004020051.649C6B8@keescook> References: <27106d62fdbd4ffb47796236050e418131cb837f.1585811416.git.christophe.leroy@c-s.fr> <6da6fa391c0d6344cc9ff99a69fcaa65666f3947.1585811416.git.christophe.leroy@c-s.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6da6fa391c0d6344cc9ff99a69fcaa65666f3947.1585811416.git.christophe.leroy@c-s.fr> Sender: owner-linux-mm@kvack.org To: Christophe Leroy Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , airlied@linux.ie, daniel@ffwll.ch, torvalds@linux-foundation.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, linux-arch@vger.kernel.org List-ID: Message-ID: <20200402075215.7lHtPBpSgLVOvN3m9bS-aSjiSuhc-FdpNTjhtqNp3FM@z> On Thu, Apr 02, 2020 at 07:34:18AM +0000, Christophe Leroy wrote: > When i915_gem_execbuffer2_ioctl() is using user_access_begin(), > that's only to perform unsafe_put_user() so use > user_write_access_begin() in order to only open write access. > > Signed-off-by: Christophe Leroy Why is this split from the other conversions? Reviewed-by: Kees Cook > --- > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index 7643a30ba4cd..4be8205a70b6 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -1611,14 +1611,14 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb) > * happened we would make the mistake of assuming that the > * relocations were valid. > */ > - if (!user_access_begin(urelocs, size)) > + if (!user_write_access_begin(urelocs, size)) > goto end; > > for (copied = 0; copied < nreloc; copied++) > unsafe_put_user(-1, > &urelocs[copied].presumed_offset, > end_user); > - user_access_end(); > + user_write_access_end(); > > eb->exec[i].relocs_ptr = (uintptr_t)relocs; > } > @@ -1626,7 +1626,7 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb) > return 0; > > end_user: > - user_access_end(); > + user_write_access_end(); > end: > kvfree(relocs); > err = -EFAULT; > @@ -2991,7 +2991,8 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data, > * And this range already got effectively checked earlier > * when we did the "copy_from_user()" above. > */ > - if (!user_access_begin(user_exec_list, count * sizeof(*user_exec_list))) > + if (!user_write_access_begin(user_exec_list, > + count * sizeof(*user_exec_list))) > goto end; > > for (i = 0; i < args->buffer_count; i++) { > @@ -3005,7 +3006,7 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data, > end_user); > } > end_user: > - user_access_end(); > + user_write_access_end(); > end:; > } > > -- > 2.25.0 > -- Kees Cook