提交 70eeff66 编写于 作者: R Roland Dreier 提交者: David S. Miller

qed: Fix potential use-after-free in qed_spq_post()

We need to check if p_ent->comp_mode is QED_SPQ_MODE_EBLOCK before
calling qed_spq_add_entry().  The test is fine is the mode is EBLOCK,
but if it isn't then qed_spq_add_entry() might kfree(p_ent).
Signed-off-by: NRoland Dreier <roland@purestorage.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 0d9c9f0f
...@@ -776,6 +776,7 @@ int qed_spq_post(struct qed_hwfn *p_hwfn, ...@@ -776,6 +776,7 @@ int qed_spq_post(struct qed_hwfn *p_hwfn,
int rc = 0; int rc = 0;
struct qed_spq *p_spq = p_hwfn ? p_hwfn->p_spq : NULL; struct qed_spq *p_spq = p_hwfn ? p_hwfn->p_spq : NULL;
bool b_ret_ent = true; bool b_ret_ent = true;
bool eblock;
if (!p_hwfn) if (!p_hwfn)
return -EINVAL; return -EINVAL;
...@@ -794,6 +795,11 @@ int qed_spq_post(struct qed_hwfn *p_hwfn, ...@@ -794,6 +795,11 @@ int qed_spq_post(struct qed_hwfn *p_hwfn,
if (rc) if (rc)
goto spq_post_fail; goto spq_post_fail;
/* Check if entry is in block mode before qed_spq_add_entry,
* which might kfree p_ent.
*/
eblock = (p_ent->comp_mode == QED_SPQ_MODE_EBLOCK);
/* Add the request to the pending queue */ /* Add the request to the pending queue */
rc = qed_spq_add_entry(p_hwfn, p_ent, p_ent->priority); rc = qed_spq_add_entry(p_hwfn, p_ent, p_ent->priority);
if (rc) if (rc)
...@@ -811,7 +817,7 @@ int qed_spq_post(struct qed_hwfn *p_hwfn, ...@@ -811,7 +817,7 @@ int qed_spq_post(struct qed_hwfn *p_hwfn,
spin_unlock_bh(&p_spq->lock); spin_unlock_bh(&p_spq->lock);
if (p_ent->comp_mode == QED_SPQ_MODE_EBLOCK) { if (eblock) {
/* For entries in QED BLOCK mode, the completion code cannot /* For entries in QED BLOCK mode, the completion code cannot
* perform the necessary cleanup - if it did, we couldn't * perform the necessary cleanup - if it did, we couldn't
* access p_ent here to see whether it's successful or not. * access p_ent here to see whether it's successful or not.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册