diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-09 16:20:59 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-09 16:20:59 -1000 |
| commit | 972acfb49446b30a3533ceb5682bf8350c786bc8 (patch) | |
| tree | 27f194c8b6e171bb800bfd611b8c7529ddff10b5 | |
| parent | 869e3305f23dfeacdaa234717c92ccb237815d90 (diff) | |
| parent | 6af1c849dfb1f1d326fbdd157c9bc882b921f450 (diff) | |
| download | fscrypt-972acfb49446b30a3533ceb5682bf8350c786bc8.tar.gz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
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()
| -rw-r--r-- | fs/aio.c | 4 | ||||
| -rw-r--r-- | lib/iov_iter.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/fs/aio.c b/fs/aio.c index a4cc2a1cccb751..3490d1fa0e16f4 100644 --- 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 index ea36dc355da131..b396d328a7643b 100644 --- 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); |