From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:51376 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161690AbcE3UUr (ORCPT ); Mon, 30 May 2016 16:20:47 -0400 Subject: Patch "tty: vt, return error when con_startup fails" has been added to the 4.4-stable tree To: jslaby@suse.cz, dan.carpenter@oracle.com, gregkh@linuxfoundation.org Cc: , From: Date: Mon, 30 May 2016 13:20:46 -0700 Message-ID: <146463964618183@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled tty: vt, return error when con_startup fails to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: tty-vt-return-error-when-con_startup-fails.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 6798df4c5fe0a7e6d2065cf79649a794e5ba7114 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 3 May 2016 17:05:54 +0200 Subject: tty: vt, return error when con_startup fails From: Jiri Slaby commit 6798df4c5fe0a7e6d2065cf79649a794e5ba7114 upstream. When csw->con_startup() fails in do_register_con_driver, we return no error (i.e. 0). This was changed back in 2006 by commit 3e795de763. Before that we used to return -ENODEV. So fix the return value to be -ENODEV in that case again. Fixes: 3e795de763 ("VT binding: Add binding/unbinding support for the VT console") Signed-off-by: Jiri Slaby Reported-by: "Dan Carpenter" Signed-off-by: Greg Kroah-Hartman --- drivers/tty/vt/vt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -3583,9 +3583,10 @@ static int do_register_con_driver(const goto err; desc = csw->con_startup(); - - if (!desc) + if (!desc) { + retval = -ENODEV; goto err; + } retval = -EINVAL; Patches currently in stable-queue which might be from jslaby@suse.cz are queue-4.4/bluetooth-vhci-purge-unhandled-skbs.patch queue-4.4/tty-n_gsm-fix-false-positive-warn_on.patch queue-4.4/bluetooth-vhci-fix-open_timeout-vs.-hdev-race.patch queue-4.4/tty-vt-return-error-when-con_startup-fails.patch