lkml.org 
[lkml]   [2006]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH-2.4] fbcon: incorrect use of "&&" instead of "&"
Hi Geert,

I'm about to merge this in 2.4. Do you have any objection ?

Thanks,
Willy

From c969fc8009aeb748368319cec463ae2516f6fb17 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sat, 25 Nov 2006 21:54:10 +0100
Subject: [PATCH] fbcon: incorrect use of "&&" instead of "&"

The use of "&&" in the following statement causes unexpected
cases to be matched since __SCROLL_YMASK = 0x0f :

switch (p->scrollmode && __SCROLL_YMASK)
case __SCROLL_YWRAP: ... /* 0x02 */
case __SCROLL_YPAN: ... /* 0x01 */

The YWRAP case can never be matched and the YPAN case may be
matched by mistake. Obvious fix is to replace && with &. This
bug is not present in 2.6.

Signed-off-by: Willy Tarreau <w@1wt.eu>
---
drivers/video/fbcon.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/fbcon.c b/drivers/video/fbcon.c
index 0fb40c5..1f66819 100644
--- a/drivers/video/fbcon.c
+++ b/drivers/video/fbcon.c
@@ -2102,7 +2102,7 @@ static int fbcon_scrolldelta(struct vc_d

offset = p->yscroll-scrollback_current;
limit = p->vrows;
- switch (p->scrollmode && __SCROLL_YMASK) {
+ switch (p->scrollmode & __SCROLL_YMASK) {
case __SCROLL_YWRAP:
p->var.vmode |= FB_VMODE_YWRAP;
break;
--
1.4.2.4
-
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/

\
 
 \ /
  Last update: 2006-11-25 21:37    [W:0.038 / U:0.612 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site