diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-16 22:41:47 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-16 22:41:47 +0200 |
commit | f685fc6ab05192c7bb924288c8685b95e92a7c65 (patch) | |
tree | 804b643604f19adefdcbd03065bb3e1bee515cf7 /drivers/hv | |
parent | 7adb05bb813d1ba4863c8914eead6139d3d5f8ff (diff) | |
parent | 7876320f88802b22d4e2daf7eb027dd14175a0f8 (diff) | |
download | linux-f685fc6ab05192c7bb924288c8685b95e92a7c65.tar.gz linux-f685fc6ab05192c7bb924288c8685b95e92a7c65.tar.bz2 linux-f685fc6ab05192c7bb924288c8685b95e92a7c65.zip |
Merge b4.19-rc4 into char-misc-next
We want the bugfixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
-rw-r--r-- | drivers/hv/vmbus_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index e6d8fdac6d8b..4bbc420d1213 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -1368,6 +1368,9 @@ static ssize_t vmbus_chan_attr_show(struct kobject *kobj, if (!attribute->show) return -EIO; + if (chan->state != CHANNEL_OPENED_STATE) + return -EINVAL; + return attribute->show(chan, buf); } |