From: Tomas Winkler <tomas.winkler@intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alexander Usyskin <alexander.usyskin@intel.com>,
linux-kernel@vger.kernel.org,
Tomas Winkler <tomas.winkler@intel.com>,
"Gustavo A . R . Silva" <gustavoars@kernel.org>
Subject: [char-misc-next] Revert "mei: hdcp: Replace one-element array with flexible-array member"
Date: Wed, 29 Jul 2020 00:41:39 +0300 [thread overview]
Message-ID: <20200728214139.3129532-1-tomas.winkler@intel.com> (raw)
Greg please revert, this commit it changes size of
struct wired_cmd_repeater_auth_stream_req_in, this is
not what firmware is expecting.
I really do not appreciate that the code is bypassing
driver maintaner review, I think this is a minimum
we can ask for, this is not for a first time.
This reverts commit c56967d674e361ebe716e66992e3c5332b25ac1f.
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/hdcp/mei_hdcp.c | 2 +-
drivers/misc/mei/hdcp/mei_hdcp.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index d1d3e025ca0e..e6c3dc595617 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -572,7 +572,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,
HDCP_2_2_MPRIME_LEN);
drm_hdcp_cpu_to_be24(verify_mprime_in.seq_num_m, data->seq_num_m);
memcpy(verify_mprime_in.streams, data->streams,
- array_size(data->k, sizeof(*data->streams)));
+ (data->k * sizeof(struct hdcp2_streamid_type)));
verify_mprime_in.k = cpu_to_be16(data->k);
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.h b/drivers/misc/mei/hdcp/mei_hdcp.h
index 834757f5e072..18ffc773fa18 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.h
+++ b/drivers/misc/mei/hdcp/mei_hdcp.h
@@ -358,7 +358,7 @@ struct wired_cmd_repeater_auth_stream_req_in {
u8 seq_num_m[HDCP_2_2_SEQ_NUM_LEN];
u8 m_prime[HDCP_2_2_MPRIME_LEN];
__be16 k;
- struct hdcp2_streamid_type streams[];
+ struct hdcp2_streamid_type streams[1];
} __packed;
struct wired_cmd_repeater_auth_stream_req_out {
--
2.25.4
next reply other threads:[~2020-07-28 21:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 21:41 Tomas Winkler [this message]
2020-07-28 21:56 ` [char-misc-next] Revert "mei: hdcp: Replace one-element array with flexible-array member" Gustavo A. R. Silva
2020-07-28 22:01 ` Winkler, Tomas
2020-07-28 22:14 ` Gustavo A. R. Silva
2020-07-28 22:14 ` Winkler, Tomas
2020-07-28 22:29 ` Winkler, Tomas
2020-07-28 23:04 ` Gustavo A. R. Silva
2020-07-28 23:07 ` Winkler, Tomas
2020-07-28 23:16 ` Gustavo A. R. Silva
2020-07-29 3:57 ` Gustavo A. R. Silva
2020-07-28 23:06 ` Joe Perches
2020-07-28 23:08 ` Winkler, Tomas
2020-07-28 22:17 ` Gustavo A. R. Silva
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=20200728214139.3129532-1-tomas.winkler@intel.com \
--to=tomas.winkler@intel.com \
--cc=alexander.usyskin@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavoars@kernel.org \
--cc=linux-kernel@vger.kernel.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 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.