Message-ID: <1428417548.20888.105.camel@perches.com>
Subject: Re: [PATCH] x86: Fix earlyprintk ttyS2/3
From: Joe Perches <joe@perches.com>
To: Daniel J Blueman <daniel@numascale.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, x86@kernel.org,
        linux-kernel@vger.kernel.org, Steffen Persvold <sp@numascale.com>
Date: Tue, 07 Apr 2015 07:39:08 -0700
In-Reply-To: <1428416957-19278-1-git-send-email-daniel@numascale.com>
References: <1428416957-19278-1-git-send-email-daniel@numascale.com>
Content-Type: text/plain; charset="ISO-8859-1"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1187
Lines: 33

On Tue, 2015-04-07 at 22:29 +0800, Daniel J Blueman wrote:
> Quite a few platforms use ttyS2 for their serial-over-LAN, so fix early
> printk support for ttyS2 and 3, avoiding the need to hard-code the IO port.
[]
> diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c
[]
> @@ -71,15 +71,16 @@ static void parse_earlyprintk(void)
>  			else
>  				pos = e - arg;
>  		} else if (!strncmp(arg + pos, "ttyS", 4)) {
> -			static const int bases[] = { 0x3f8, 0x2f8 };
> -			int idx = 0;
> +			static const int bases[] = {0x3f8, 0x2f8, 0x3e8, 0x2e8};
> +			unsigned idx = 0;
>  
>  			if (!strncmp(arg + pos, "ttyS", 4))
>  				pos += 4;
>  
> -			if (arg[pos++] == '1')
> -				idx = 1;
> +			if ((arg[pos] - '0') < (sizeof(bases) / sizeof(bases[0])))
> +				idx = arg[pos] - '0';

This doesn't prevent negative indexing in case someone
does something like shift key typo "ttyS!" for "ttyS1".

I've done that.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/