ice: ice_aq_check_events: fix off-by-one check when filling buffer
[ Upstream commite1e8a142c4
] Allow task's event buffer to be filled also in the case that it's size is exactly the size of the message. Fixes:d69ea414c9
("ice: implement device flash update via devlink") Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Reviewed-by: Simon Horman <horms@kernel.org> Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
55fab9389d
Коммит
660b6b1c5c
|
@ -1177,6 +1177,7 @@ int ice_aq_wait_for_event(struct ice_pf *pf, u16 opcode, unsigned long timeout,
|
|||
static void ice_aq_check_events(struct ice_pf *pf, u16 opcode,
|
||||
struct ice_rq_event_info *event)
|
||||
{
|
||||
struct ice_rq_event_info *task_ev;
|
||||
struct ice_aq_task *task;
|
||||
bool found = false;
|
||||
|
||||
|
@ -1185,15 +1186,15 @@ static void ice_aq_check_events(struct ice_pf *pf, u16 opcode,
|
|||
if (task->state || task->opcode != opcode)
|
||||
continue;
|
||||
|
||||
memcpy(&task->event->desc, &event->desc, sizeof(event->desc));
|
||||
task->event->msg_len = event->msg_len;
|
||||
task_ev = task->event;
|
||||
memcpy(&task_ev->desc, &event->desc, sizeof(event->desc));
|
||||
task_ev->msg_len = event->msg_len;
|
||||
|
||||
/* Only copy the data buffer if a destination was set */
|
||||
if (task->event->msg_buf &&
|
||||
task->event->buf_len > event->buf_len) {
|
||||
memcpy(task->event->msg_buf, event->msg_buf,
|
||||
if (task_ev->msg_buf && task_ev->buf_len >= event->buf_len) {
|
||||
memcpy(task_ev->msg_buf, event->msg_buf,
|
||||
event->buf_len);
|
||||
task->event->buf_len = event->buf_len;
|
||||
task_ev->buf_len = event->buf_len;
|
||||
}
|
||||
|
||||
task->state = ICE_AQ_TASK_COMPLETE;
|
||||
|
|
Загрузка…
Ссылка в новой задаче