Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

torvalds · torvalds · commit 972acfb49446 · 2019-04-09T16:20:59.000-10:00
Pull misc fixes from Al Viro:
 "A few regression fixes from this cycle"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  aio: use kmem_cache_free() instead of kfree()
  iov_iter: Fix build error without CONFIG_CRYPTO
  aio: Fix an error code in __io_submit_one()
diff --git a/fs/aio.c b/fs/aio.c
@@ -1034,7 +1034,7 @@ static inline struct aio_kiocb *aio_get_req(struct kioctx *ctx)
 		return NULL;
 
 	if (unlikely(!get_reqs_available(ctx))) {
-		kfree(req);
+		kmem_cache_free(kiocb_cachep, req);
 		return NULL;
 	}
 
@@ -1794,7 +1794,7 @@ static int __io_submit_one(struct kioctx *ctx, const struct iocb *iocb,
 		 */
 		eventfd = eventfd_ctx_fdget(iocb->aio_resfd);
 		if (IS_ERR(eventfd))
-			return PTR_ERR(req->ki_eventfd);
+			return PTR_ERR(eventfd);
 
 		req->ki_eventfd = eventfd;
 	}
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
@@ -1528,6 +1528,7 @@ EXPORT_SYMBOL(csum_and_copy_to_iter);
 size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,
 		struct iov_iter *i)
 {
+#ifdef CONFIG_CRYPTO
 	struct ahash_request *hash = hashp;
 	struct scatterlist sg;
 	size_t copied;
@@ -1537,6 +1538,9 @@ size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,
 	ahash_request_set_crypt(hash, &sg, NULL, copied);
 	crypto_ahash_update(hash);
 	return copied;
+#else
+	return 0;
+#endif
 }
 EXPORT_SYMBOL(hash_and_copy_to_iter);
 

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,7 @@ static inline struct aio_kiocb aio_get_req(struct kioctx ctx)`
`1034`	`1034`	`return NULL;`
`1035`	`1035`
`1036`	`1036`	`if (unlikely(!get_reqs_available(ctx))) {`
`1037`		`- kfree(req);`
	`1037`	`+ kmem_cache_free(kiocb_cachep, req);`
`1038`	`1038`	`return NULL;`
`1039`	`1039`	`}`
`1040`	`1040`
`@@ -1794,7 +1794,7 @@ static int __io_submit_one(struct kioctx ctx, const struct iocb iocb,`
`1794`	`1794`	`*/`
`1795`	`1795`	`eventfd = eventfd_ctx_fdget(iocb->aio_resfd);`
`1796`	`1796`	`if (IS_ERR(eventfd))`
`1797`		`- return PTR_ERR(req->ki_eventfd);`
	`1797`	`+ return PTR_ERR(eventfd);`
`1798`	`1798`
`1799`	`1799`	`req->ki_eventfd = eventfd;`
`1800`	`1800`	`}`