From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Kees Cook <kees.cook@canonical.com>
Cc: linux-kernel@vger.kernel.org, Dave Airlie <airlied@redhat.com>,
Clemens Ladisch <clemens@ladisch.de>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
Devin Heitmueller <dheitmueller@kernellabs.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans Verkuil <hverkuil@xs4all.nl>,
dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org
Subject: Re: [PATCH] drm, video: fix use-before-NULL-check
Date: Mon, 30 Aug 2010 09:31:04 -0700 [thread overview]
Message-ID: <20100830093104.5aa22a0a@jbarnes-desktop> (raw)
In-Reply-To: <20100827210719.GD4703@outflux.net>
On Fri, 27 Aug 2010 14:07:19 -0700
Kees Cook <kees.cook@canonical.com> wrote:
> Fix potential crashes due to use-before-NULL situations.
>
> Signed-off-by: Kees Cook <kees.cook@canonical.com>
> ---
> drivers/gpu/drm/drm_fb_helper.c | 3 ++-
> drivers/media/video/em28xx/em28xx-video.c | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index de82e20..8dd7e6f 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -94,10 +94,11 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_fb_helper_conn
> int i;
> enum drm_connector_force force = DRM_FORCE_UNSPECIFIED;
> struct drm_fb_helper_cmdline_mode *cmdline_mode;
> - struct drm_connector *connector = fb_helper_conn->connector;
> + struct drm_connector *connector;
>
> if (!fb_helper_conn)
> return false;
> + connector = fb_helper_conn->connector;
>
> cmdline_mode = &fb_helper_conn->cmdline_mode;
> if (!mode_option)
> diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
> index 7b9ec6e..95a4b60 100644
> --- a/drivers/media/video/em28xx/em28xx-video.c
> +++ b/drivers/media/video/em28xx/em28xx-video.c
> @@ -277,12 +277,13 @@ static void em28xx_copy_vbi(struct em28xx *dev,
> {
> void *startwrite, *startread;
> int offset;
> - int bytesperline = dev->vbi_width;
> + int bytesperline;
>
> if (dev == NULL) {
> em28xx_isocdbg("dev is null\n");
> return;
> }
> + bytesperline = dev->vbi_width;
>
> if (dma_q == NULL) {
> em28xx_isocdbg("dma_q is null\n");
Look fine to me.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
prev parent reply other threads:[~2010-08-30 16:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-27 21:07 Kees Cook
2010-08-30 16:31 ` Jesse Barnes [this message]
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=20100830093104.5aa22a0a@jbarnes-desktop \
--to=jbarnes@virtuousgeek.org \
--cc=airlied@redhat.com \
--cc=clemens@ladisch.de \
--cc=dheitmueller@kernellabs.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hverkuil@xs4all.nl \
--cc=kees.cook@canonical.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome