| Message ID | 20180704095236.l3ub5au4jhoihk3g@kili.mountain |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] qed: off by one in qed_parse_mcp_trace_buf() | expand |
From: Dan Carpenter [mailto:dan.carpenter@oracle.com] Sent: Wednesday, July 04, 2018 12:53 PM > If format_idx == s_mcp_trace_meta.formats_num then we read one element > beyond the end of the s_mcp_trace_meta.formats[] array. > > Fixes: 50bc60cb155c ("qed*: Utilize FW 8.33.11.0") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Thanks Acked-by: Tomer Tayar <Tomer.Tayar@cavium.com>
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Wed, 4 Jul 2018 12:52:36 +0300 > If format_idx == s_mcp_trace_meta.formats_num then we read one element > beyond the end of the s_mcp_trace_meta.formats[] array. > > Fixes: 50bc60cb155c ("qed*: Utilize FW 8.33.11.0") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied.
diff --git a/drivers/net/ethernet/qlogic/qed/qed_debug.c b/drivers/net/ethernet/qlogic/qed/qed_debug.c index a14e48489029..4340c4c90bcb 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_debug.c +++ b/drivers/net/ethernet/qlogic/qed/qed_debug.c @@ -6723,7 +6723,7 @@ static enum dbg_status qed_parse_mcp_trace_buf(u8 *trace_buf, format_idx = header & MFW_TRACE_EVENTID_MASK; /* Skip message if its index doesn't exist in the meta data */ - if (format_idx > s_mcp_trace_meta.formats_num) { + if (format_idx >= s_mcp_trace_meta.formats_num) { u8 format_size = (u8)((header & MFW_TRACE_PRM_SIZE_MASK) >> MFW_TRACE_PRM_SIZE_SHIFT);
If format_idx == s_mcp_trace_meta.formats_num then we read one element beyond the end of the s_mcp_trace_meta.formats[] array. Fixes: 50bc60cb155c ("qed*: Utilize FW 8.33.11.0") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>