From: "Ville Syrjälä" <ville.syrjala@linux.intel.com> To: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: DRI Development <dri-devel@lists.freedesktop.org>, Stephen Rothwell <sfr@canb.auug.org.au>, syzbot+fb77e97ebf0612ee6914@syzkaller.appspotmail.com, Kees Cook <keescook@chromium.org>, LKML <linux-kernel@vger.kernel.org>, Alexander Viro <viro@zeniv.linux.org.uk>, Daniel Vetter <daniel.vetter@intel.com>, Andrew Morton <akpm@linux-foundation.org> Subject: Re: [PATCH] drm: Limit to INT_MAX in create_blob ioctl Date: Wed, 6 Nov 2019 19:03:17 +0200 [thread overview] Message-ID: <20191106170317.GU1208@intel.com> (raw) In-Reply-To: <20191106164755.31478-1-daniel.vetter@ffwll.ch> On Wed, Nov 06, 2019 at 05:47:55PM +0100, Daniel Vetter wrote: > The hardened usercpy code is too paranoid ever since: > > commit 6a30afa8c1fbde5f10f9c584c2992aa3c7f7a8fe > Author: Kees Cook <keescook@chromium.org> > Date: Wed Nov 6 16:07:01 2019 +1100 > > uaccess: disallow > INT_MAX copy sizes > > Code itself should have been fine as-is. > > Reported-by: syzbot+fb77e97ebf0612ee6914@syzkaller.appspotmail.com > Fixes: 6a30afa8c1fb ("uaccess: disallow > INT_MAX copy sizes") > Cc: Kees Cook <keescook@chromium.org> > Cc: Alexander Viro <viro@zeniv.linux.org.uk> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Stephen Rothwell <sfr@canb.auug.org.au> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > -- > Kees/Andrew, > > Since this is -mm can I have a stable sha1 or something for > referencing? Or do you want to include this in the -mm patch bomb for > the merge window? > -Daniel > --- > drivers/gpu/drm/drm_property.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c > index 892ce636ef72..6ee04803c362 100644 > --- a/drivers/gpu/drm/drm_property.c > +++ b/drivers/gpu/drm/drm_property.c > @@ -561,7 +561,7 @@ drm_property_create_blob(struct drm_device *dev, size_t length, > struct drm_property_blob *blob; > int ret; > > - if (!length || length > ULONG_MAX - sizeof(struct drm_property_blob)) > + if (!length || length > INT_MAX - sizeof(struct drm_property_blob)) > return ERR_PTR(-EINVAL); INT_MAX should be more than enough. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > blob = kvzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL); > -- > 2.24.0.rc2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel
WARNING: multiple messages have this Message-ID (diff)
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com> To: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Stephen Rothwell <sfr@canb.auug.org.au>, syzbot+fb77e97ebf0612ee6914@syzkaller.appspotmail.com, Kees Cook <keescook@chromium.org>, LKML <linux-kernel@vger.kernel.org>, DRI Development <dri-devel@lists.freedesktop.org>, Alexander Viro <viro@zeniv.linux.org.uk>, Daniel Vetter <daniel.vetter@intel.com>, Andrew Morton <akpm@linux-foundation.org> Subject: Re: [PATCH] drm: Limit to INT_MAX in create_blob ioctl Date: Wed, 6 Nov 2019 19:03:17 +0200 [thread overview] Message-ID: <20191106170317.GU1208@intel.com> (raw) Message-ID: <20191106170317.qgP2nBn7NqpX85Bw2pbW8DyYx8zRQCj_QbsC7XurExc@z> (raw) In-Reply-To: <20191106164755.31478-1-daniel.vetter@ffwll.ch> On Wed, Nov 06, 2019 at 05:47:55PM +0100, Daniel Vetter wrote: > The hardened usercpy code is too paranoid ever since: > > commit 6a30afa8c1fbde5f10f9c584c2992aa3c7f7a8fe > Author: Kees Cook <keescook@chromium.org> > Date: Wed Nov 6 16:07:01 2019 +1100 > > uaccess: disallow > INT_MAX copy sizes > > Code itself should have been fine as-is. > > Reported-by: syzbot+fb77e97ebf0612ee6914@syzkaller.appspotmail.com > Fixes: 6a30afa8c1fb ("uaccess: disallow > INT_MAX copy sizes") > Cc: Kees Cook <keescook@chromium.org> > Cc: Alexander Viro <viro@zeniv.linux.org.uk> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Stephen Rothwell <sfr@canb.auug.org.au> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > -- > Kees/Andrew, > > Since this is -mm can I have a stable sha1 or something for > referencing? Or do you want to include this in the -mm patch bomb for > the merge window? > -Daniel > --- > drivers/gpu/drm/drm_property.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c > index 892ce636ef72..6ee04803c362 100644 > --- a/drivers/gpu/drm/drm_property.c > +++ b/drivers/gpu/drm/drm_property.c > @@ -561,7 +561,7 @@ drm_property_create_blob(struct drm_device *dev, size_t length, > struct drm_property_blob *blob; > int ret; > > - if (!length || length > ULONG_MAX - sizeof(struct drm_property_blob)) > + if (!length || length > INT_MAX - sizeof(struct drm_property_blob)) > return ERR_PTR(-EINVAL); INT_MAX should be more than enough. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > blob = kvzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL); > -- > 2.24.0.rc2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-11-06 17:03 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-06 16:47 [PATCH] drm: Limit to INT_MAX in create_blob ioctl Daniel Vetter 2019-11-06 16:47 ` Daniel Vetter 2019-11-06 17:03 ` Ville Syrjälä [this message] 2019-11-06 17:03 ` Ville Syrjälä 2019-11-06 17:24 ` Kees Cook 2019-11-06 17:24 ` Kees Cook 2019-11-06 17:56 ` Daniel Vetter 2019-11-06 17:56 ` Daniel Vetter 2019-11-06 18:13 ` Andrew Morton 2019-11-06 18:13 ` Andrew Morton
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191106170317.GU1208@intel.com \ --to=ville.syrjala@linux.intel.com \ --cc=akpm@linux-foundation.org \ --cc=daniel.vetter@ffwll.ch \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=keescook@chromium.org \ --cc=linux-kernel@vger.kernel.org \ --cc=sfr@canb.auug.org.au \ --cc=syzbot+fb77e97ebf0612ee6914@syzkaller.appspotmail.com \ --cc=viro@zeniv.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.