| Message ID | 1470145810-17513-1-git-send-email-weiyj.lk@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 02, 2016 at 01:50:10PM +0000, Wei Yongjun wrote: > Add the missing unlock before return from function > vhost_net_set_features() in the error handling case. > > Fixes: eefe82d9b81f ('vhost: new device IOTLB API') > Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Thanks! I'll squash this into the offending commit. > --- > drivers/vhost/net.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c > index c6bdd90..5dc128a 100644 > --- a/drivers/vhost/net.c > +++ b/drivers/vhost/net.c > @@ -1104,13 +1104,12 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features) > } > mutex_lock(&n->dev.mutex); > if ((features & (1 << VHOST_F_LOG_ALL)) && > - !vhost_log_access_ok(&n->dev)) { > - mutex_unlock(&n->dev.mutex); > - return -EFAULT; > - } > + !vhost_log_access_ok(&n->dev)) > + goto out_unlock; > + > if ((features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))) { > if (vhost_init_device_iotlb(&n->dev, true)) > - return -EFAULT; > + goto out_unlock; > } > > for (i = 0; i < VHOST_NET_VQ_MAX; ++i) { > @@ -1122,6 +1121,10 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features) > } > mutex_unlock(&n->dev.mutex); > return 0; > + > +out_unlock: > + mutex_unlock(&n->dev.mutex); > + return -EFAULT; > } > > static long vhost_net_set_owner(struct vhost_net *n) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index c6bdd90..5dc128a 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -1104,13 +1104,12 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features) } mutex_lock(&n->dev.mutex); if ((features & (1 << VHOST_F_LOG_ALL)) && - !vhost_log_access_ok(&n->dev)) { - mutex_unlock(&n->dev.mutex); - return -EFAULT; - } + !vhost_log_access_ok(&n->dev)) + goto out_unlock; + if ((features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))) { if (vhost_init_device_iotlb(&n->dev, true)) - return -EFAULT; + goto out_unlock; } for (i = 0; i < VHOST_NET_VQ_MAX; ++i) { @@ -1122,6 +1121,10 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features) } mutex_unlock(&n->dev.mutex); return 0; + +out_unlock: + mutex_unlock(&n->dev.mutex); + return -EFAULT; } static long vhost_net_set_owner(struct vhost_net *n)
Add the missing unlock before return from function vhost_net_set_features() in the error handling case. Fixes: eefe82d9b81f ('vhost: new device IOTLB API') Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> --- drivers/vhost/net.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html