Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90c8acce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull vhost fixes from Michael Tsirkin:
 "Two bugfixes only here"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: fix error handling for memory region alloc
  vhost: actually track log eventfd file
parents 30b4f0fa 1e099473

drivers/vhost/vhost.c

+2 −4
Original line number Diff line number Diff line
@@ -683,11 +683,8 @@ static void *vhost_kvzalloc(unsigned long size) 
{

	void *n = kzalloc(size, GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);



	if (!n) {

		n = vzalloc(size);

	if (!n)

			return ERR_PTR(-ENOMEM);

	}

		n = vzalloc(size);

	return n;

}
@@ -995,6 +992,7 @@ long vhost_dev_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp) 
		}

		if (eventfp != d->log_file) {

			filep = d->log_file;

			d->log_file = eventfp;

			ctx = d->log_ctx;

			d->log_ctx = eventfp ?

				eventfd_ctx_fileget(eventfp) : NULL;