renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 09:13:55 +08:00
Code

tty/vt: consolemap: change refcount only if needed in con_do_clear_unimap()

Browse Source 
con_do_clear_unimap() currently decreases and increases refcount of old
dictionary in a back and forth fashion. This makes the code really hard
to follow. Decrease the refcount only if everything went well and we
really allocated a new one and decoupled from the old dictionary.

I sincerelly hope I did not make a mistake in this (ill) logic.

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220607104946.18710-33-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2022-06-07 12:49:43 +02:00 committed by Greg Kroah-Hartman
parent d8d0d1758c
commit a7e50de460
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/tty/vt/consolemap.c
View File

@ -535,22 +535,23 @@ static int con_do_clear_unimap(struct vc_data *vc)
{
struct uni_pagedict *old = *vc->vc_uni_pagedir_loc;
if (!old || --old->refcount) {
if (!old || old->refcount > 1) {
struct uni_pagedict *new = kzalloc(sizeof(*new), GFP_KERNEL);
if (!new) {
if (old)
old->refcount++;
if (!new)
return -ENOMEM;
}
new->refcount = 1;
*vc->vc_uni_pagedir_loc = new;
if (old)
old->refcount--;
} else {
if (old == dflt)
dflt = NULL;
old->refcount++;
old->sum = 0;
con_release_unimap(old);
}
return 0;
}