From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23750C83003 for ; Wed, 29 Apr 2020 13:50:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 012932074A for ; Wed, 29 Apr 2020 13:50:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 012932074A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C357F6EE9C; Wed, 29 Apr 2020 13:50:52 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A8D46EE92; Wed, 29 Apr 2020 13:50:51 +0000 (UTC) IronPort-SDR: VYMLkdjKlob/DTdjbbTiiHX7dM1Nh1mxFcu2kjh/2ude0ZlFi2QwZ881Z8dAANHVDeZVQQQXOH akZ+9gLPymaA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2020 06:50:50 -0700 IronPort-SDR: 1xpY+sMdXN4K8fsTC/fMXhwMlGYt9Hs4Nzc0BEwk98DwmPqEtFquc73+EXSKTiOgM8Tp2P5vfU OMy3VmCOlK/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,332,1583222400"; d="scan'208";a="459201296" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.154]) by fmsmga005.fm.intel.com with ESMTP; 29 Apr 2020 06:50:46 -0700 Date: Wed, 29 Apr 2020 19:20:37 +0530 From: Ramalingam C To: Sean Paul Subject: Re: [PATCH v2] drm: Fix HDCP failures when SRM fw is missing Message-ID: <20200429135037.GF22816@intel.com> References: <20200414184835.2878-1-sean@poorly.run> <20200414190258.38873-1-sean@poorly.run> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200414190258.38873-1-sean@poorly.run> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, David Airlie , intel-gfx@lists.freedesktop.org, Sean Paul , stable@vger.kernel.org, Thomas Zimmermann Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 2020-04-14 at 15:02:55 -0400, Sean Paul wrote: > From: Sean Paul > > The SRM cleanup in 79643fddd6eb2 ("drm/hdcp: optimizing the srm > handling") inadvertently altered the behavior of HDCP auth when > the SRM firmware is missing. Before that patch, missing SRM was > interpreted as the device having no revoked keys. With that patch, > if the SRM fw file is missing we reject _all_ keys. > > This patch fixes that regression by returning success if the file > cannot be found. It also checks the return value from request_srm such > that we won't end up trying to parse the ksv list if there is an error > fetching it. > > Fixes: 79643fddd6eb ("drm/hdcp: optimizing the srm handling") > Cc: stable@vger.kernel.org > Cc: Ramalingam C > Cc: Sean Paul > Cc: Maarten Lankhorst > Cc: Maxime Ripard > Cc: Thomas Zimmermann > Cc: David Airlie > Cc: Daniel Vetter > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Sean Paul > > Changes in v2: > -Noticed a couple other things to clean up > --- > > Sorry for the quick rev, noticed a couple other loose ends that should > be cleaned up. > > drivers/gpu/drm/drm_hdcp.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_hdcp.c b/drivers/gpu/drm/drm_hdcp.c > index 7f386adcf872..910108ccaae1 100644 > --- a/drivers/gpu/drm/drm_hdcp.c > +++ b/drivers/gpu/drm/drm_hdcp.c > @@ -241,8 +241,12 @@ static int drm_hdcp_request_srm(struct drm_device *drm_dev, > > ret = request_firmware_direct(&fw, (const char *)fw_name, > drm_dev->dev); > - if (ret < 0) > + if (ret < 0) { > + *revoked_ksv_cnt = 0; > + *revoked_ksv_list = NULL; These two variables are already initialized by the caller. > + ret = 0; Missing of this should have been caught by CI. May be CI system always having the SRM file from previous execution. Never been removed. IGT need a fix to clean the prior SRM files before execution. CI fix shouldn't block this fix. > goto exit; > + } > > if (fw->size && fw->data) > ret = drm_hdcp_srm_update(fw->data, fw->size, revoked_ksv_list, > @@ -287,6 +291,8 @@ int drm_hdcp_check_ksvs_revoked(struct drm_device *drm_dev, u8 *ksvs, > > ret = drm_hdcp_request_srm(drm_dev, &revoked_ksv_list, > &revoked_ksv_cnt); > + if (ret) > + return ret; This error code also shouldn't effect the caller(i915) hence pushed a change https://patchwork.freedesktop.org/series/76730/ With these addresed. LGTM. Reviewed-by: Ramalingam C > > /* revoked_ksv_cnt will be zero when above function failed */ > for (i = 0; i < revoked_ksv_cnt; i++) > -- > Sean Paul, Software Engineer, Google / Chromium OS > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel