From: Jani Nikula <jani.nikula@linux.intel.com>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Sean Paul <sean@poorly.run>
Cc: Wei Yongjun <weiyongjun1@huawei.com>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH -next] drm/i915: fix possible memory leak in intel_hdcp_auth_downstream()
Date: Thu, 01 Aug 2019 10:18:23 +0000 [thread overview]
Message-ID: <87k1bxmbo0.fsf@intel.com> (raw)
In-Reply-To: <20190704104534.12508-1-weiyongjun1@huawei.com>
On Thu, 04 Jul 2019, Wei Yongjun <weiyongjun1@huawei.com> wrote:
> 'ksv_fifo' is malloced in intel_hdcp_auth_downstream() and should be
> freed before leaving from the error handling cases, otherwise it will
> cause memory leak.
Thanks for the patch, sorry for the delay, pushed to
drm-intel-next-queued.
BR,
Jani.
>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index bc3a94d491c4..27bd7276a82d 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -536,7 +536,8 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
>
> if (drm_hdcp_check_ksvs_revoked(dev, ksv_fifo, num_downstream)) {
> DRM_ERROR("Revoked Ksv(s) in ksv_fifo\n");
> - return -EPERM;
> + ret = -EPERM;
> + goto err;
> }
>
> /*
>
>
>
--
Jani Nikula, Intel Open Source Graphics Center
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Sean Paul <sean@poorly.run>
Cc: Wei Yongjun <weiyongjun1@huawei.com>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH -next] drm/i915: fix possible memory leak in intel_hdcp_auth_downstream()
Date: Thu, 01 Aug 2019 13:18:23 +0300 [thread overview]
Message-ID: <87k1bxmbo0.fsf@intel.com> (raw)
In-Reply-To: <20190704104534.12508-1-weiyongjun1@huawei.com>
On Thu, 04 Jul 2019, Wei Yongjun <weiyongjun1@huawei.com> wrote:
> 'ksv_fifo' is malloced in intel_hdcp_auth_downstream() and should be
> freed before leaving from the error handling cases, otherwise it will
> cause memory leak.
Thanks for the patch, sorry for the delay, pushed to
drm-intel-next-queued.
BR,
Jani.
>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index bc3a94d491c4..27bd7276a82d 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -536,7 +536,8 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
>
> if (drm_hdcp_check_ksvs_revoked(dev, ksv_fifo, num_downstream)) {
> DRM_ERROR("Revoked Ksv(s) in ksv_fifo\n");
> - return -EPERM;
> + ret = -EPERM;
> + goto err;
> }
>
> /*
>
>
>
--
Jani Nikula, Intel Open Source Graphics Center
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Wei Yongjun <weiyongjun1@huawei.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Sean Paul <sean@poorly.run>
Cc: Wei Yongjun <weiyongjun1@huawei.com>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH -next] drm/i915: fix possible memory leak in intel_hdcp_auth_downstream()
Date: Thu, 01 Aug 2019 13:18:23 +0300 [thread overview]
Message-ID: <87k1bxmbo0.fsf@intel.com> (raw)
In-Reply-To: <20190704104534.12508-1-weiyongjun1@huawei.com>
On Thu, 04 Jul 2019, Wei Yongjun <weiyongjun1@huawei.com> wrote:
> 'ksv_fifo' is malloced in intel_hdcp_auth_downstream() and should be
> freed before leaving from the error handling cases, otherwise it will
> cause memory leak.
Thanks for the patch, sorry for the delay, pushed to
drm-intel-next-queued.
BR,
Jani.
>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index bc3a94d491c4..27bd7276a82d 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -536,7 +536,8 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
>
> if (drm_hdcp_check_ksvs_revoked(dev, ksv_fifo, num_downstream)) {
> DRM_ERROR("Revoked Ksv(s) in ksv_fifo\n");
> - return -EPERM;
> + ret = -EPERM;
> + goto err;
> }
>
> /*
>
>
>
--
Jani Nikula, Intel Open Source Graphics Center
next prev parent reply other threads:[~2019-08-01 10:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 10:45 [PATCH -next] drm/i915: fix possible memory leak in intel_hdcp_auth_downstream() Wei Yongjun
2019-07-04 10:45 ` Wei Yongjun
2019-07-04 10:45 ` Wei Yongjun
2019-07-05 15:22 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-07-07 1:43 ` ✓ Fi.CI.IGT: " Patchwork
2019-08-01 10:18 ` Jani Nikula [this message]
2019-08-01 10:18 ` [PATCH -next] " Jani Nikula
2019-08-01 10:18 ` Jani Nikula
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=87k1bxmbo0.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=joonas.lahtinen@linux.intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=sean@poorly.run \
--cc=weiyongjun1@huawei.com \
/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 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.