mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-20 08:47:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

use clamp() for counts in csi_?() handlers

Browse Source 
The count to process is supposed to be between 1 and vc->vc_cols -
vc->state.x (or rows and .y). clamp() can be used exactly for this,
instead of ifs and min().

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Tested-by: Helge Deller <deller@gmx.de> # parisc STI console
Link: https://lore.kernel.org/r/20240122110401.7289-14-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby (SUSE)
2024-01-22 12:03:27 +01:00
committed by Greg Kroah-Hartman
parent fe4f6beb59
commit eb881ebab5
1 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/tty/vt/vt.c
View File

@@ -1574,12 +1574,7 @@ static void csi_K(struct vc_data *vc, int vpar)
/* erase the following vpar positions */
static void csi_X(struct vc_data *vc, unsigned int vpar)
{ /* not vt100? */
unsigned int count;
if (!vpar)
vpar++;
count = min(vpar, vc->vc_cols - vc->state.x);
unsigned int count = clamp(vpar, 1, vc->vc_cols - vc->state.x);
vc_uniscr_clear_line(vc, vc->state.x, count);
scr_memsetw((unsigned short *)vc->vc_pos, vc->vc_video_erase_char, 2 * count);
@@ -2010,20 +2005,14 @@ static void setterm_command(struct vc_data *vc)
/* console_lock is held */
static void csi_at(struct vc_data *vc, unsigned int nr)
{
if (nr > vc->vc_cols - vc->state.x)
nr = vc->vc_cols - vc->state.x;
else if (!nr)
nr = 1;
nr = clamp(nr, 1, vc->vc_cols - vc->state.x);
insert_char(vc, nr);
}
/* console_lock is held */
static void csi_L(struct vc_data *vc, unsigned int nr)
{
if (nr > vc->vc_rows - vc->state.y)
nr = vc->vc_rows - vc->state.y;
else if (!nr)
nr = 1;
nr = clamp(nr, 1, vc->vc_rows - vc->state.y);
con_scroll(vc, vc->state.y, vc->vc_bottom, SM_DOWN, nr);
vc->vc_need_wrap = 0;
}
@@ -2031,20 +2020,14 @@ static void csi_L(struct vc_data *vc, unsigned int nr)
/* console_lock is held */
static void csi_P(struct vc_data *vc, unsigned int nr)
{
if (nr > vc->vc_cols - vc->state.x)
nr = vc->vc_cols - vc->state.x;
else if (!nr)
nr = 1;
nr = clamp(nr, 1, vc->vc_cols - vc->state.x);
delete_char(vc, nr);
}
/* console_lock is held */
static void csi_M(struct vc_data *vc, unsigned int nr)
{
if (nr > vc->vc_rows - vc->state.y)
nr = vc->vc_rows - vc->state.y;
else if (!nr)
nr=1;
nr = clamp(nr, 1, vc->vc_rows - vc->state.y);
con_scroll(vc, vc->state.y, vc->vc_bottom, SM_UP, nr);
vc->vc_need_wrap = 0;
}