From 4668cecf0766ebfe4893c5da81febbb9d4b86f22 Mon Sep 17 00:00:00 2001 From: Takuya Yoshikawa Date: Thu, 27 May 2010 19:01:58 +0900 Subject: [PATCH] --- yaml --- r: 199201 b: refs/heads/master c: d3553a52490dcac54f45083f8fa018e26c22e947 h: refs/heads/master i: 199199: 41ff4b51944e8d8ab0b8dd4cfdde0891178d7f3b v: v3 --- [refs] | 2 +- trunk/drivers/vhost/net.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3ae5fbf60be1..73da9a0cd0c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ad9c9d27048547e96e4e3a13b5780ec6f81bb9f +refs/heads/master: d3553a52490dcac54f45083f8fa018e26c22e947 diff --git a/trunk/drivers/vhost/net.c b/trunk/drivers/vhost/net.c index aa88911c9504..0f41c9195e9b 100644 --- a/trunk/drivers/vhost/net.c +++ b/trunk/drivers/vhost/net.c @@ -593,17 +593,17 @@ static long vhost_net_ioctl(struct file *f, unsigned int ioctl, int r; switch (ioctl) { case VHOST_NET_SET_BACKEND: - r = copy_from_user(&backend, argp, sizeof backend); - if (r < 0) - return r; + if (copy_from_user(&backend, argp, sizeof backend)) + return -EFAULT; return vhost_net_set_backend(n, backend.index, backend.fd); case VHOST_GET_FEATURES: features = VHOST_FEATURES; - return copy_to_user(featurep, &features, sizeof features); + if (copy_to_user(featurep, &features, sizeof features)) + return -EFAULT; + return 0; case VHOST_SET_FEATURES: - r = copy_from_user(&features, featurep, sizeof features); - if (r < 0) - return r; + if (copy_from_user(&features, featurep, sizeof features)) + return -EFAULT; if (features & ~VHOST_FEATURES) return -EOPNOTSUPP; return vhost_net_set_features(n, features);