diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-07-18 04:09:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-25 07:47:35 -0400 |
commit | 61d51456f35760a09e8aa1e6ddd247f1547015d3 (patch) | |
tree | bd9251376f2282c624aa21417db4b2ae0fa46e87 | |
parent | 4a2b8560e3dff8637ccb09524650864f60ebab7f (diff) |
vt: Grab console_lock around con_is_bound in show_bind
Not really harmful not to, but also not harm in grabbing the lock. And
this shuts up a new WARNING I introduced in commit ddde3c18b700 ("vt:
More locking checks").
Reported-by: Jens Remus <jremus@linux.ibm.com>
Cc: linux-kernel@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Martin Hostettler <textshell@uchuujin.de>
Cc: Adam Borowski <kilobyte@angband.pl>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sam Ravnborg <sam@ravnborg.org>
Fixes: ddde3c18b700 ("vt: More locking checks")
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Tested-by: Jens Remus <jremus@linux.ibm.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://lore.kernel.org/r/20190718080903.22622-1-daniel.vetter@ffwll.ch
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/vt/vt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index ec92f36ab5c4..34aa39d1aed9 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c | |||
@@ -3771,7 +3771,11 @@ static ssize_t show_bind(struct device *dev, struct device_attribute *attr, | |||
3771 | char *buf) | 3771 | char *buf) |
3772 | { | 3772 | { |
3773 | struct con_driver *con = dev_get_drvdata(dev); | 3773 | struct con_driver *con = dev_get_drvdata(dev); |
3774 | int bind = con_is_bound(con->con); | 3774 | int bind; |
3775 | |||
3776 | console_lock(); | ||
3777 | bind = con_is_bound(con->con); | ||
3778 | console_unlock(); | ||
3775 | 3779 | ||
3776 | return snprintf(buf, PAGE_SIZE, "%i\n", bind); | 3780 | return snprintf(buf, PAGE_SIZE, "%i\n", bind); |
3777 | } | 3781 | } |