From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752759Ab0ICGbW (ORCPT ); Fri, 3 Sep 2010 02:31:22 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:64521 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751432Ab0ICGbV (ORCPT ); Fri, 3 Sep 2010 02:31:21 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=tcVYTOt8sQ0tlBMjMvQ1/SdRyvdtgtG1zTvVb+leH5dYRR2z9HEUX7ebU6aN4v/U/7 uJIQdfDRCDV6Mpqj53jI6JY48LzNnUaaBZyd2PDBLS4wRLptW10Ojz3Tviy2eAoWN74h nhIzwzAdZ5CSS7HoFGaTx74ui+AiIY/WLZpys= Message-ID: <4C809632.6090706@gmail.com> Date: Fri, 03 Sep 2010 16:01:14 +0930 From: Graham Gower User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100721 Thunderbird/3.0.6 MIME-Version: 1.0 To: linux-kernel@vger.kernel.org Subject: [PATCH] drivers/char/vt_ioctl.c: Fix VT_OPENQRY error value Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When all VT's are in use, VT_OPENQRY casts -1 to unsigned char before returning it to userspace as an int. VT255 is not the next available console. Signed-off-by: Graham Gower --- drivers/char/vt_ioctl.c~ 2010-08-11 04:07:31.000000000 +0930 +++ drivers/char/vt_ioctl.c 2010-09-03 15:12:30.000000000 +0930 @@ -503,6 +503,7 @@ struct kbd_struct * kbd; unsigned int console; unsigned char ucval; + unsigned int uival; void __user *up = (void __user *)arg; int i, perm; int ret = 0; @@ -657,7 +658,7 @@ break; case KDGETMODE: - ucval = vc->vc_mode; + uival = vc->vc_mode; goto setint; case KDMAPDISP: @@ -695,7 +696,7 @@ break; case KDGKBMODE: - ucval = ((kbd->kbdmode == VC_RAW) ? K_RAW : + uival = ((kbd->kbdmode == VC_RAW) ? K_RAW : (kbd->kbdmode == VC_MEDIUMRAW) ? K_MEDIUMRAW : (kbd->kbdmode == VC_UNICODE) ? K_UNICODE : K_XLATE); @@ -949,7 +950,7 @@ for (i = 0; i < MAX_NR_CONSOLES; ++i) if (! VT_IS_IN_USE(i)) break; - ucval = i < MAX_NR_CONSOLES ? (i+1) : -1; + uival = i < MAX_NR_CONSOLES ? (i+1) : -1; goto setint; /*