4.14-stable review patch. If anyone has any objections, please let me know.
------------------ From: Christophe JAILLET <christophe.jail...@wanadoo.fr> [ Upstream commit b1402dcb5643b7a27d46a05edd7491d49ba0e248 ] If 'dma_map_sg()', we should branch to the existing error handling path to free some resources before returning. Link: http://lkml.kernel.org/r/61292a4f369229eee03394247385e955027283f8.1505687047.git.christophe.jail...@wanadoo.fr Signed-off-by: Christophe JAILLET <christophe.jail...@wanadoo.fr> Reviewed-by: Logan Gunthorpe <log...@deltatee.com> Cc: Matt Porter <mpor...@kernel.crashing.org> Cc: Alexandre Bounine <alexandre.boun...@idt.com> Cc: Lorenzo Stoakes <lstoa...@gmail.com> Cc: Jesper Nilsson <jesper.nils...@axis.com> Cc: Christian K_nig <christian.koe...@amd.com> Signed-off-by: Andrew Morton <a...@linux-foundation.org> Signed-off-by: Linus Torvalds <torva...@linux-foundation.org> Signed-off-by: Sasha Levin <alexander.le...@verizon.com> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- drivers/rapidio/devices/rio_mport_cdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/rapidio/devices/rio_mport_cdev.c +++ b/drivers/rapidio/devices/rio_mport_cdev.c @@ -963,7 +963,8 @@ rio_dma_transfer(struct file *filp, u32 req->sgt.sgl, req->sgt.nents, dir); if (nents == -EFAULT) { rmcd_error("Failed to map SG list"); - return -EFAULT; + ret = -EFAULT; + goto err_pg; } ret = do_dma_request(req, xfer, sync, nents);
