Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (52107c54) · Commits · 戴 / test

Pull crypto fix from Herbert Xu: "This fixes a bug in cavium/nitrox where the callback is invoked prior to the DMA unmap" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: cavium/nitrox - Invoke callback after DMA unmap

drivers/crypto/cavium/nitrox/nitrox_reqmgr.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -537,6 +537,8 @@ static void process_response_list(struct nitrox_cmdq *cmdq)
		struct nitrox_device *ndev = cmdq->ndev;
		struct nitrox_softreq *sr;
		int req_completed = 0, err = 0, budget;
		completion_t callback;
		void *cb_arg;

		/* check all pending requests */
		budget = atomic_read(&cmdq->pending_count);
		@@ -564,13 +566,13 @@ static void process_response_list(struct nitrox_cmdq *cmdq)
		smp_mb__after_atomic();
		/* remove from response list */
		response_list_del(sr, cmdq);

		/* ORH error code */
		err = READ_ONCE(*sr->resp.orh) & 0xff;

		if (sr->callback)
		sr->callback(sr->cb_arg, err);
		callback = sr->callback;
		cb_arg = sr->cb_arg;
		softreq_destroy(sr);
		if (callback)
		callback(cb_arg, err);

		req_completed++;
		}

Admin message