drm/i915: Fix memory leak in intel_hdcp auth
Subsystems (2)
PATCH 1/2 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.
--- drivers/gpu/drm/i915/intel_hdcp.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_hdcp.c +15 -4
@@ -186,14 +186,18 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,return -ENOMEM ; ret = shim->read_ksv_fifo (intel_dig_port, num_downstream, ksv_fifo); -if (ret) +if (ret) { +kfree (ksv_fifo);return ret; + }/* Process V' values from the receiver */ for (i =0 ; i <DRM_HDCP_V_PRIME_NUM_PARTS ; i++) { ret = shim->read_v_prime_part (intel_dig_port, i, &vprime); -if (ret) +if (ret) { +kfree (ksv_fifo);return ret; + }I915_WRITE (HDCP_SHA_V_PRIME (i), vprime); }
@@ -222,8 +226,10 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, sha_text |= ksv[j] << ((sizeof (sha_text) - j -1 ) *8 ); ret =intel_write_sha_text (dev_priv, sha_text); -if (ret <0 ) +if (ret <0 ) { +kfree (ksv_fifo);return ret; + }/* Programming guide writes this every 64 bytes */ sha_idx +=sizeof (sha_text);
@@ -245,13 +251,18 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,continue ; ret =intel_write_sha_text (dev_priv, sha_text); -if (ret <0 ) +if (ret <0 ) { +kfree (ksv_fifo);return ret; + } + sha_leftovers =0 ; sha_text =0 ; sha_idx +=sizeof (sha_text); } +kfree (ksv_fifo); +/* * We need to write BINFO/BSTATUS, and M0 now. Depending on how many * bytes are leftover from the last ksv, we might be able to fit them
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Use int instead of u32 to cache GuC logging level
Static code analysis tool has reported an unused check of log_level<0 when using u32. Use int instead of u32 to store guc_log_level.
--- drivers/gpu/drm/i915/intel_guc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_guc.c +1 -1
@@ -225,7 +225,7 @@ static u32 get_core_family(struct drm_i915_private *dev_priv)static u32 get_log_control_flags (void ) { -u32 level = i915_modparams.guc_log_level; +int level = i915_modparams.guc_log_level;u32 flags =0 ;GEM_BUG_ON (level <0 );
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Fix memory leak in intel_hdcp auth
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Fix memory leak in intel_hdcp auth
URL : https://patchwork.freedesktop.org/series/41099/
State : success
== Summary ==
Series 41099v1 series starting with [1/2] drm/i915: Fix memory leak in intel_hdcp auth
https://patchwork.freedesktop.org/api/1.0/series/41099/revisions/1/mbox/
---- Known issues:
Test debugfs_test:
Subgroup read_all_entries:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-c:
fail -> PASS (fi-skl-6700k2) fdo#103191
Subgroup suspend-read-crc-pipe-c:
pass -> INCOMPLETE (fi-bxt-dsi) fdo#103927fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:431s 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:382s fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:541s fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:299s fi-bxt-dsi total:243 pass:216 dwarn:0 dfail:0 fail:0 skip:26 fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:521s fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:524s fi-byt-n2820 total:285 pass:246 dwarn:0 dfail:0 fail:0 skip:39 time:512s fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:414s fi-cfl-s3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:562s fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:517s fi-cnl-y3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:581s fi-elk-e7500 total:285 pass:225 dwarn:1 dfail:0 fail:0 skip:59 time:418s fi-gdg-551 total:285 pass:176 dwarn:0 dfail:0 fail:1 skip:108 time:315s fi-glk-1 total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:539s fi-hsw-4770 total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:412s fi-ilk-650 total:285 pass:225 dwarn:0 dfail:0 fail:0 skip:60 time:426s 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:432s 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:461s fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:512s fi-pnv-d510 total:285 pass:219 dwarn:1 dfail:0 fail:0 skip:65 time:662s fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:447s 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:502s fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:501s fi-skl-guc total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:431s fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:444s fi-snb-2520m total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-snb-2600 total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:417s Blacklisted hosts: fi-cnl-psr total:285 pass:256 dwarn:3 dfail:0 fail:0 skip:26 time:541s fi-glk-j4005 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:487s
29940f138482ff38047287ad288cea1fcf1f73b4 drm-tip: 2018y-04m-03d-13h-23m-36s UTC integration manifest 54ab53f6b376 drm/i915: Use int instead of u32 to cache GuC logging level c7076cb5c716 drm/i915: Fix memory leak in intel_hdcp auth
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8575/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915: Fix memory leak in intel_hdcp auth
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Fix memory leak in intel_hdcp auth
URL : https://patchwork.freedesktop.org/series/41099/
State : success
== Summary ==
---- Possible new issues:
Test kms_draw_crc:
Subgroup draw-method-xrgb8888-mmap-wc-untiled:
skip -> PASS (shard-snb)
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-indfb-draw-mmap-cpu:
skip -> PASS (shard-snb)
Subgroup fbc-1p-primscrn-spr-indfb-move:
skip -> PASS (shard-snb)
Subgroup fbc-stridechange:
fail -> PASS (shard-snb)
Subgroup fbcpsr-rgb565-draw-blt:
fail -> SKIP (shard-snb)
Subgroup psr-2p-scndscrn-pri-indfb-draw-render:
fail -> SKIP (shard-snb)
Subgroup psr-2p-scndscrn-spr-indfb-onoff:
fail -> SKIP (shard-snb)
Test kms_universal_plane:
Subgroup universal-plane-pipe-a-sanity:
fail -> PASS (shard-snb)
Test prime_vgem:
Subgroup basic-fence-flip:
skip -> PASS (shard-snb)---- Known issues:
Test kms_flip:
Subgroup modeset-vs-vblank-race-interruptible:
pass -> FAIL (shard-hsw) fdo#103060
Subgroup plain-flip-fb-recreate-interruptible:
fail -> PASS (shard-hsw) fdo#100368
Test kms_frontbuffer_tracking:
Subgroup fbcpsr-2p-primscrn-shrfb-pgflip-blt:
fail -> SKIP (shard-snb) fdo#103167 +1
Test kms_mmap_write_crc:
dmesg-warn -> PASS (shard-hsw) fdo#103286fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103286 https://bugs.freedesktop.org/show_bug.cgi?id=103286
shard-apl total:3498 pass:1834 dwarn:1 dfail:0 fail:7 skip:1655 time:12886s shard-hsw total:3498 pass:1784 dwarn:1 dfail:0 fail:2 skip:1710 time:11590s shard-snb total:3498 pass:1377 dwarn:1 dfail:0 fail:2 skip:2118 time:7082s
Blacklisted hosts:
shard-kbl total:3498 pass:1962 dwarn:1 dfail:0 fail:7 skip:1528 time:9326s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8575/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 14 lines · Radhakrishna Sripada
Static code analysis tool reported memory leak in
intel_hdcp_auth_downstream. Fixing the memory leak.Cc Anusha Srivatsa <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +0
-0
drivers/gpu/drm/i915/intel_hdcp.c int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, · line 190
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-1@@ -186,14 +186,18 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,return -ENOMEM ; ret = shim->read_ksv_fifo (intel_dig_port, num_downstream, ksv_fifo); -if (ret) +if (ret) { +kfree (ksv_fifo);
Please add an single cleanup label and goto it from all error paths.
BR,
Jani.
Quoted 46 lines
drivers/gpu/drm/i915/intel_hdcp.c +13
-3return ret; + }/* Process V' values from the receiver */ for (i =0 ; i <DRM_HDCP_V_PRIME_NUM_PARTS ; i++) { ret = shim->read_v_prime_part (intel_dig_port, i, &vprime); -if (ret) +if (ret) { +kfree (ksv_fifo);return ret; + }I915_WRITE (HDCP_SHA_V_PRIME (i), vprime); }@@ -222,8 +226,10 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, sha_text |= ksv[j] << ((sizeof (sha_text) - j -1 ) *8 ); ret =intel_write_sha_text (dev_priv, sha_text); -if (ret <0 ) +if (ret <0 ) { +kfree (ksv_fifo);return ret; + }/* Programming guide writes this every 64 bytes */ sha_idx +=sizeof (sha_text);@@ -245,13 +251,18 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,continue ; ret =intel_write_sha_text (dev_priv, sha_text); -if (ret <0 ) +if (ret <0 ) { +kfree (ksv_fifo);return ret; + } + sha_leftovers =0 ; sha_text =0 ; sha_idx +=sizeof (sha_text); } +kfree (ksv_fifo); +/* * We need to write BINFO/BSTATUS, and M0 now. Depending on how many * bytes are leftover from the last ksv, we might be able to fit them
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Thanks for fixing this.
Quoted 8 lines
-----Original Message-----
From: Sripada, Radhakrishna
Sent: Tuesday, April 3, 2018 5:05 PM
To: [email protected]
Cc: Sripada, Radhakrishna <[email protected]>; Srivatsa, Anusha <[email protected]>
Subject: [PATCH 1/2] drm/i915: Fix memory leak inintel_hdcpauth
Quoted 5 lines
Static code analysis tool reported memory leak in
intel_hdcp_auth_downstream. Fixing the memory leak.Cc Anusha Srivatsa <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>
Quoted 64 lines
---
drivers/gpu/drm/i915/intel_hdcp.c| 19 +++++++++++++++----1 file changed, 15 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +9
-3@@ -186,14 +186,18 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, return -ENOMEM ; ret = shim->read_ksv_fifo (intel_dig_port, num_downstream, ksv_fifo); -if (ret) +if (ret) { +kfree (ksv_fifo);return ret; + }/* Process V' values from the receiver */ for (i =0 ; i <DRM_HDCP_V_PRIME_NUM_PARTS ; i++) { ret = shim->read_v_prime_part (intel_dig_port, i, &vprime); -if (ret) +if (ret) { +kfree (ksv_fifo);return ret; + }I915_WRITE (HDCP_SHA_V_PRIME (i), vprime); }@@ -222,8 +226,10 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, sha_text |= ksv[j] << ((sizeof (sha_text) - j -1 ) *8 ); ret =intel_write_sha_text (dev_priv, sha_text); -if (ret <0 ) +if (ret <0 ) { +kfree (ksv_fifo);return ret; + }/* Programming guide writes this every 64 bytes */ sha_idx += sizeof(sha_text);drivers/gpu/drm/i915/intel_hdcp.c +6
-1@@ -245,13 +251,18 @@ int intel_hdcp_auth_downstream(structintel_digital_port *intel_dig_port, continue; ret =intel_write_sha_text (dev_priv, sha_text); -if (ret <0 ) +if (ret <0 ) { +kfree (ksv_fifo);return ret; + } + sha_leftovers =0 ; sha_text =0 ; sha_idx +=sizeof (sha_text); } +kfree (ksv_fifo); +/* * We need to write BINFO/BSTATUS, and M0 now. Depending on how
Quoted 4 lines
many
* bytes are leftover from the last ksv, we might be able to fit them
--
2.9.3
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx