xfs: Fix error code in 'xfs_ioc_getbmap()'

tititiou36 · djwong · commit 132bf6723749 · 2018-11-06T07:50:50.000-08:00
In this function, once 'buf' has been allocated, we unconditionally return 0. However, 'error' is set to some error codes in several error handling paths. Before commit 232b519 ("xfs: simplify the xfs_getbmap interface") this was not an issue because all error paths were returning directly, but now that some cleanup at the end may be needed, we must propagate the error code. Fixes: 232b519 ("xfs: simplify the xfs_getbmap interface") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
@@ -1608,7 +1608,7 @@ xfs_ioc_getbmap(
 	error = 0;
 out_free_buf:
 	kmem_free(buf);
-	return 0;
+	return error;
 }
 
 struct getfsmap_info {

Original file line number	Diff line number	Diff line change
`@@ -1608,7 +1608,7 @@ xfs_ioc_getbmap(`
`1608`	`1608`	`error = 0;`
`1609`	`1609`	`out_free_buf:`
`1610`	`1610`	`kmem_free(buf);`
`1611`		`- return 0;`
	`1611`	`+ return error;`
`1612`	`1612`	`}`
`1613`	`1613`
`1614`	`1614`	`struct getfsmap_info {`