* [PATCH v2] drm/i915: Fix memory leak in intel_hdcp auth
@ 2018-04-04 22:59 Radhakrishna Sripada
2018-04-04 23:22 ` ✗ Fi.CI.BAT: failure for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Radhakrishna Sripada @ 2018-04-04 22:59 UTC (permalink / raw)
To: intel-gfx
Static code analysis tool reported memory leak in
intel_hdcp_auth_downstream. Fixing the memory leak.
v2: Rebase, move free to a cleanup label(Jani)
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
---
drivers/gpu/drm/i915/intel_hdcp.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index 98a9c81e2dc1..2db5da550a1c 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -435,7 +435,7 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,
ret = shim->read_ksv_fifo(intel_dig_port, num_downstream, ksv_fifo);
if (ret)
- return ret;
+ goto err;
/*
* When V prime mismatches, DP Spec mandates re-read of
@@ -451,12 +451,15 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,
if (i == tries) {
DRM_ERROR("V Prime validation failed.(%d)\n", ret);
- return ret;
+ goto err;
}
DRM_DEBUG_KMS("HDCP is enabled (%d downstream devices)\n",
num_downstream);
- return 0;
+ ret = 0;
+err:
+ kfree(ksv_fifo);
+ return ret;
}
/* Implements Part 1 of the HDCP authorization procedure */
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* ✗ Fi.CI.BAT: failure for drm/i915: Fix memory leak in intel_hdcp auth 2018-04-04 22:59 [PATCH v2] drm/i915: Fix memory leak in intel_hdcp auth Radhakrishna Sripada @ 2018-04-04 23:22 ` Patchwork 2018-04-05 6:31 ` [PATCH v2] " Srivatsa, Anusha ` (2 subsequent siblings) 3 siblings, 0 replies; 6+ messages in thread From: Patchwork @ 2018-04-04 23:22 UTC (permalink / raw) To: Radhakrishna Sripada; +Cc: intel-gfx == Series Details == Series: drm/i915: Fix memory leak in intel_hdcp auth URL : https://patchwork.freedesktop.org/series/41163/ State : failure == Summary == Series 41163v1 drm/i915: Fix memory leak in intel_hdcp auth https://patchwork.freedesktop.org/api/1.0/series/41163/revisions/1/mbox/ ---- Possible new issues: Test pm_rpm: Subgroup basic-pci-d3-state: pass -> INCOMPLETE (fi-bxt-dsi) ---- Known issues: Test gem_exec_suspend: Subgroup basic-s3: dmesg-warn -> PASS (fi-glk-j4005) fdo#103359 Test gem_mmap_gtt: Subgroup basic-small-bo-tiledx: fail -> PASS (fi-gdg-551) fdo#102575 Test kms_pipe_crc_basic: Subgroup suspend-read-crc-pipe-b: pass -> FAIL (fi-skl-guc) fdo#104108 fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359 fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575 fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108 fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:434s fi-bdw-gvtdvm total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:444s fi-blb-e6850 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:380s fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:540s fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:297s fi-bxt-dsi total:248 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:517s fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:522s fi-byt-n2820 total:285 pass:246 dwarn:0 dfail:0 fail:0 skip:39 time:508s fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:409s fi-cfl-s3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:557s fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:510s fi-cnl-y3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:578s fi-elk-e7500 total:285 pass:226 dwarn:0 dfail:0 fail:0 skip:59 time:423s fi-gdg-551 total:285 pass:177 dwarn:0 dfail:0 fail:0 skip:108 time:315s fi-glk-1 total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:539s fi-glk-j4005 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:485s fi-hsw-4770 total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:407s fi-ilk-650 total:285 pass:225 dwarn:0 dfail:0 fail:0 skip:60 time:420s fi-ivb-3520m total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:470s fi-ivb-3770 total:285 pass:252 dwarn:0 dfail:0 fail:0 skip:33 time:433s fi-kbl-7500u total:285 pass:260 dwarn:1 dfail:0 fail:0 skip:24 time:476s fi-kbl-7567u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:471s fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:509s fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:443s fi-skl-6600u total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:533s fi-skl-6700k2 total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:504s fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:496s fi-skl-guc total:285 pass:256 dwarn:0 dfail:0 fail:1 skip:28 time:409s fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:446s fi-snb-2520m total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:571s fi-snb-2600 total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:403s Blacklisted hosts: fi-cnl-psr total:285 pass:256 dwarn:3 dfail:0 fail:0 skip:26 time:527s e29a10513429cca404e9847a399efbdbb4bdd4bf drm-tip: 2018y-04m-04d-20h-47m-24s UTC integration manifest 0ec8750b2932 drm/i915: Fix memory leak in intel_hdcp auth == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8583/issues.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] drm/i915: Fix memory leak in intel_hdcp auth 2018-04-04 22:59 [PATCH v2] drm/i915: Fix memory leak in intel_hdcp auth Radhakrishna Sripada 2018-04-04 23:22 ` ✗ Fi.CI.BAT: failure for " Patchwork @ 2018-04-05 6:31 ` Srivatsa, Anusha 2018-04-06 7:07 ` Jani Nikula 2018-04-05 10:46 ` ✓ Fi.CI.BAT: success for " Patchwork 2018-04-05 12:57 ` ✗ Fi.CI.IGT: failure " Patchwork 3 siblings, 1 reply; 6+ messages in thread From: Srivatsa, Anusha @ 2018-04-05 6:31 UTC (permalink / raw) To: Sripada, Radhakrishna, intel-gfx Earlier, I responded to the wrong version of the patch :( Apologies. >-----Original Message----- >From: Sripada, Radhakrishna >Sent: Wednesday, April 4, 2018 4:00 PM >To: intel-gfx@lists.freedesktop.org >Cc: Sripada, Radhakrishna <radhakrishna.sripada@intel.com>; Jani Nikula ><jani.nikula@linux.intel.com>; Srivatsa, Anusha <anusha.srivatsa@intel.com> >Subject: [PATCH v2] drm/i915: Fix memory leak in intel_hdcp auth > >Static code analysis tool reported memory leak in intel_hdcp_auth_downstream. >Fixing the memory leak. > >v2: Rebase, move free to a cleanup label(Jani) > >Cc: Jani Nikula <jani.nikula@linux.intel.com> >Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> >Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com> >--- > drivers/gpu/drm/i915/intel_hdcp.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > >diff --git a/drivers/gpu/drm/i915/intel_hdcp.c >b/drivers/gpu/drm/i915/intel_hdcp.c >index 98a9c81e2dc1..2db5da550a1c 100644 >--- a/drivers/gpu/drm/i915/intel_hdcp.c >+++ b/drivers/gpu/drm/i915/intel_hdcp.c >@@ -435,7 +435,7 @@ int intel_hdcp_auth_downstream(struct intel_digital_port >*intel_dig_port, > > ret = shim->read_ksv_fifo(intel_dig_port, num_downstream, ksv_fifo); > if (ret) >- return ret; >+ goto err; > > /* > * When V prime mismatches, DP Spec mandates re-read of @@ -451,12 >+451,15 @@ int intel_hdcp_auth_downstream(struct intel_digital_port >*intel_dig_port, > > if (i == tries) { > DRM_ERROR("V Prime validation failed.(%d)\n", ret); >- return ret; >+ goto err; > } > > DRM_DEBUG_KMS("HDCP is enabled (%d downstream devices)\n", > num_downstream); >- return 0; >+ ret = 0; >+err: >+ kfree(ksv_fifo); >+ return ret; > } > > /* Implements Part 1 of the HDCP authorization procedure */ >-- >2.9.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] drm/i915: Fix memory leak in intel_hdcp auth 2018-04-05 6:31 ` [PATCH v2] " Srivatsa, Anusha @ 2018-04-06 7:07 ` Jani Nikula 0 siblings, 0 replies; 6+ messages in thread From: Jani Nikula @ 2018-04-06 7:07 UTC (permalink / raw) To: Srivatsa, Anusha, Sripada, Radhakrishna, intel-gfx On Thu, 05 Apr 2018, "Srivatsa, Anusha" <anusha.srivatsa@intel.com> wrote: > Earlier, I responded to the wrong version of the patch :( > Apologies. > >>-----Original Message----- >>From: Sripada, Radhakrishna >>Sent: Wednesday, April 4, 2018 4:00 PM >>To: intel-gfx@lists.freedesktop.org >>Cc: Sripada, Radhakrishna <radhakrishna.sripada@intel.com>; Jani Nikula >><jani.nikula@linux.intel.com>; Srivatsa, Anusha <anusha.srivatsa@intel.com> >>Subject: [PATCH v2] drm/i915: Fix memory leak in intel_hdcp auth >> >>Static code analysis tool reported memory leak in intel_hdcp_auth_downstream. >>Fixing the memory leak. >> >>v2: Rebase, move free to a cleanup label(Jani) >> >>Cc: Jani Nikula <jani.nikula@linux.intel.com> >>Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> >>Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com> Thanks for the patch and the review, pushed to dinq. BR, Jani. > >>--- >> drivers/gpu/drm/i915/intel_hdcp.c | 9 ++++++--- >> 1 file changed, 6 insertions(+), 3 deletions(-) >> >>diff --git a/drivers/gpu/drm/i915/intel_hdcp.c >>b/drivers/gpu/drm/i915/intel_hdcp.c >>index 98a9c81e2dc1..2db5da550a1c 100644 >>--- a/drivers/gpu/drm/i915/intel_hdcp.c >>+++ b/drivers/gpu/drm/i915/intel_hdcp.c >>@@ -435,7 +435,7 @@ int intel_hdcp_auth_downstream(struct intel_digital_port >>*intel_dig_port, >> >> ret = shim->read_ksv_fifo(intel_dig_port, num_downstream, ksv_fifo); >> if (ret) >>- return ret; >>+ goto err; >> >> /* >> * When V prime mismatches, DP Spec mandates re-read of @@ -451,12 >>+451,15 @@ int intel_hdcp_auth_downstream(struct intel_digital_port >>*intel_dig_port, >> >> if (i == tries) { >> DRM_ERROR("V Prime validation failed.(%d)\n", ret); >>- return ret; >>+ goto err; >> } >> >> DRM_DEBUG_KMS("HDCP is enabled (%d downstream devices)\n", >> num_downstream); >>- return 0; >>+ ret = 0; >>+err: >>+ kfree(ksv_fifo); >>+ return ret; >> } >> >> /* Implements Part 1 of the HDCP authorization procedure */ >>-- >>2.9.3 > -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Fix memory leak in intel_hdcp auth 2018-04-04 22:59 [PATCH v2] drm/i915: Fix memory leak in intel_hdcp auth Radhakrishna Sripada 2018-04-04 23:22 ` ✗ Fi.CI.BAT: failure for " Patchwork 2018-04-05 6:31 ` [PATCH v2] " Srivatsa, Anusha @ 2018-04-05 10:46 ` Patchwork 2018-04-05 12:57 ` ✗ Fi.CI.IGT: failure " Patchwork 3 siblings, 0 replies; 6+ messages in thread From: Patchwork @ 2018-04-05 10:46 UTC (permalink / raw) To: Radhakrishna Sripada; +Cc: intel-gfx == Series Details == Series: drm/i915: Fix memory leak in intel_hdcp auth URL : https://patchwork.freedesktop.org/series/41163/ State : success == Summary == Series 41163v1 drm/i915: Fix memory leak in intel_hdcp auth https://patchwork.freedesktop.org/api/1.0/series/41163/revisions/1/mbox/ ---- Known issues: Test kms_pipe_crc_basic: Subgroup suspend-read-crc-pipe-c: dmesg-warn -> PASS (fi-glk-j4005) fdo#105644 Test prime_vgem: Subgroup basic-fence-flip: fail -> PASS (fi-ilk-650) fdo#104008 fdo#105644 https://bugs.freedesktop.org/show_bug.cgi?id=105644 fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008 fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:432s fi-bdw-gvtdvm total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:442s fi-blb-e6850 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:381s fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:532s fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:300s fi-bxt-dsi total:285 pass:255 dwarn:0 dfail:0 fail:0 skip:30 time:519s fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:516s fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:527s fi-byt-n2820 total:285 pass:246 dwarn:0 dfail:0 fail:0 skip:39 time:509s fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:413s fi-cfl-s3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:559s fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:509s fi-cnl-y3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:574s fi-elk-e7500 total:285 pass:226 dwarn:0 dfail:0 fail:0 skip:59 time:425s fi-gdg-551 total:285 pass:176 dwarn:0 dfail:0 fail:1 skip:108 time:314s fi-glk-1 total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:536s fi-glk-j4005 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:485s fi-hsw-4770 total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:405s fi-ilk-650 total:285 pass:225 dwarn:0 dfail:0 fail:0 skip:60 time:420s fi-ivb-3520m total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:463s fi-ivb-3770 total:285 pass:252 dwarn:0 dfail:0 fail:0 skip:33 time:428s fi-kbl-7500u total:285 pass:260 dwarn:1 dfail:0 fail:0 skip:24 time:473s fi-kbl-7567u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:459s fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:508s fi-pnv-d510 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:669s fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:450s fi-skl-6600u total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:535s fi-skl-6700k2 total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:499s fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:503s fi-skl-guc total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:432s fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:444s fi-snb-2520m total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:592s fi-snb-2600 total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:407s Blacklisted hosts: fi-cnl-psr total:285 pass:256 dwarn:3 dfail:0 fail:0 skip:26 time:516s 0eddede73765b01ec287cad00e23bee23c216a16 drm-tip: 2018y-04m-05d-09h-51m-03s UTC integration manifest 40bd8617c47d drm/i915: Fix memory leak in intel_hdcp auth == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8589/issues.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* ✗ Fi.CI.IGT: failure for drm/i915: Fix memory leak in intel_hdcp auth 2018-04-04 22:59 [PATCH v2] drm/i915: Fix memory leak in intel_hdcp auth Radhakrishna Sripada ` (2 preceding siblings ...) 2018-04-05 10:46 ` ✓ Fi.CI.BAT: success for " Patchwork @ 2018-04-05 12:57 ` Patchwork 3 siblings, 0 replies; 6+ messages in thread From: Patchwork @ 2018-04-05 12:57 UTC (permalink / raw) To: Radhakrishna Sripada; +Cc: intel-gfx == Series Details == Series: drm/i915: Fix memory leak in intel_hdcp auth URL : https://patchwork.freedesktop.org/series/41163/ State : failure == Summary == ---- Possible new issues: Test kms_cursor_legacy: Subgroup cursor-vs-flip-toggle: fail -> PASS (shard-hsw) Test kms_frontbuffer_tracking: Subgroup fbc-rgb101010-draw-pwrite: pass -> FAIL (shard-apl) ---- Known issues: Test kms_frontbuffer_tracking: Subgroup fbc-1p-primscrn-pri-indfb-draw-render: fail -> PASS (shard-snb) fdo#103167 Test kms_setmode: Subgroup basic: fail -> PASS (shard-hsw) fdo#99912 Test kms_sysfs_edid_timing: warn -> PASS (shard-apl) fdo#100047 fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167 fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912 fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047 shard-apl total:2680 pass:1835 dwarn:1 dfail:0 fail:8 skip:836 time:12655s shard-hsw total:2680 pass:1787 dwarn:1 dfail:0 fail:0 skip:891 time:11333s shard-snb total:2680 pass:1376 dwarn:1 dfail:0 fail:4 skip:1299 time:6906s Blacklisted hosts: shard-kbl total:2622 pass:1918 dwarn:1 dfail:1 fail:7 skip:694 time:8927s == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8589/shards.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-04-06 7:06 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-04-04 22:59 [PATCH v2] drm/i915: Fix memory leak in intel_hdcp auth Radhakrishna Sripada 2018-04-04 23:22 ` ✗ Fi.CI.BAT: failure for " Patchwork 2018-04-05 6:31 ` [PATCH v2] " Srivatsa, Anusha 2018-04-06 7:07 ` Jani Nikula 2018-04-05 10:46 ` ✓ Fi.CI.BAT: success for " Patchwork 2018-04-05 12:57 ` ✗ Fi.CI.IGT: failure " Patchwork
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.