mirror of
https://github.com/labwc/labwc.git
synced 2026-04-11 08:21:13 -04:00
img: fix UAF on Reconfigure by refcounting
Before this commit, there was a use-after-free bug on Reconfigure: - theme_finish() destroys lab_imgs for titlebar icons - For some reason, undecorate() calls _create_buffer() in scaled-img-buffer.c, which calls img_render() on a destroyed lab_img. So this commit adds wlr_buffer-like APIs: lab_img_lock(), lab_img_unlock() and lab_img_drop(). This ensures a lab_img is never destroyed until no one references it.
This commit is contained in:
parent
7a6ecca804
commit
cffa7c0315
6 changed files with 42 additions and 17 deletions
|
|
@ -3,6 +3,7 @@
|
||||||
#define LABWC_IMG_H
|
#define LABWC_IMG_H
|
||||||
|
|
||||||
#include <cairo.h>
|
#include <cairo.h>
|
||||||
|
#include <stdbool.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <wayland-util.h>
|
#include <wayland-util.h>
|
||||||
|
|
||||||
|
|
@ -19,6 +20,9 @@ struct lab_img {
|
||||||
struct theme *theme; /* Used by modifier functions */
|
struct theme *theme; /* Used by modifier functions */
|
||||||
struct wl_array modifiers; /* lab_img_modifier_func_t */
|
struct wl_array modifiers; /* lab_img_modifier_func_t */
|
||||||
struct lab_img_cache *cache;
|
struct lab_img_cache *cache;
|
||||||
|
|
||||||
|
bool dropped;
|
||||||
|
int nr_locks;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct lab_img *lab_img_load(enum lab_img_type type, const char *path,
|
struct lab_img *lab_img_load(enum lab_img_type type, const char *path,
|
||||||
|
|
@ -69,10 +73,9 @@ void lab_img_add_modifier(struct lab_img *img, lab_img_modifier_func_t modifier,
|
||||||
struct lab_data_buffer *lab_img_render(struct lab_img *img,
|
struct lab_data_buffer *lab_img_render(struct lab_img *img,
|
||||||
int width, int height, int padding, double scale);
|
int width, int height, int padding, double scale);
|
||||||
|
|
||||||
/**
|
/* These functions closely follow the APIs of wlr_buffer */
|
||||||
* lab_img_destroy() - destroy lab_img
|
void lab_img_lock(struct lab_img *img);
|
||||||
* @img: lab_img to destroy
|
void lab_img_unlock(struct lab_img *img);
|
||||||
*/
|
void lab_img_drop(struct lab_img *img);
|
||||||
void lab_img_destroy(struct lab_img *img);
|
|
||||||
|
|
||||||
#endif /* LABWC_IMG_H */
|
#endif /* LABWC_IMG_H */
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,6 @@ struct ssd {
|
||||||
} title;
|
} title;
|
||||||
|
|
||||||
char *app_id;
|
char *app_id;
|
||||||
struct lab_img *icon_img;
|
|
||||||
} state;
|
} state;
|
||||||
|
|
||||||
/* An invisible area around the view which allows resizing */
|
/* An invisible area around the view which allows resizing */
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ static void
|
||||||
_destroy(struct scaled_scene_buffer *scaled_buffer)
|
_destroy(struct scaled_scene_buffer *scaled_buffer)
|
||||||
{
|
{
|
||||||
struct scaled_img_buffer *self = scaled_buffer->data;
|
struct scaled_img_buffer *self = scaled_buffer->data;
|
||||||
|
lab_img_unlock(self->img);
|
||||||
free(self);
|
free(self);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -57,6 +58,7 @@ scaled_img_buffer_create(struct wlr_scene_tree *parent, struct lab_img *img,
|
||||||
struct scaled_img_buffer *self = znew(*self);
|
struct scaled_img_buffer *self = znew(*self);
|
||||||
self->scaled_buffer = scaled_buffer;
|
self->scaled_buffer = scaled_buffer;
|
||||||
self->scene_buffer = scaled_buffer->scene_buffer;
|
self->scene_buffer = scaled_buffer->scene_buffer;
|
||||||
|
lab_img_lock(img);
|
||||||
self->img = img;
|
self->img = img;
|
||||||
self->width = width;
|
self->width = width;
|
||||||
self->height = height;
|
self->height = height;
|
||||||
|
|
@ -73,6 +75,8 @@ void
|
||||||
scaled_img_buffer_update(struct scaled_img_buffer *self, struct lab_img *img,
|
scaled_img_buffer_update(struct scaled_img_buffer *self, struct lab_img *img,
|
||||||
int width, int height, int padding)
|
int width, int height, int padding)
|
||||||
{
|
{
|
||||||
|
lab_img_unlock(self->img);
|
||||||
|
lab_img_lock(img);
|
||||||
self->img = img;
|
self->img = img;
|
||||||
self->width = width;
|
self->width = width;
|
||||||
self->height = height;
|
self->height = height;
|
||||||
|
|
|
||||||
|
|
@ -195,10 +195,10 @@ lab_img_render(struct lab_img *img, int width, int height, int padding,
|
||||||
return buffer;
|
return buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
lab_img_destroy(struct lab_img *img)
|
consider_destroy_img(struct lab_img *img)
|
||||||
{
|
{
|
||||||
if (!img) {
|
if (!img->dropped || img->nr_locks > 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -220,3 +220,28 @@ lab_img_destroy(struct lab_img *img)
|
||||||
wl_array_release(&img->modifiers);
|
wl_array_release(&img->modifiers);
|
||||||
free(img);
|
free(img);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
lab_img_lock(struct lab_img *img)
|
||||||
|
{
|
||||||
|
assert(img);
|
||||||
|
img->nr_locks++;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
lab_img_unlock(struct lab_img *img)
|
||||||
|
{
|
||||||
|
assert(img);
|
||||||
|
img->nr_locks--;
|
||||||
|
consider_destroy_img(img);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
lab_img_drop(struct lab_img *img)
|
||||||
|
{
|
||||||
|
if (!img) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
img->dropped = true;
|
||||||
|
consider_destroy_img(img);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -345,9 +345,6 @@ ssd_titlebar_destroy(struct ssd *ssd)
|
||||||
if (ssd->state.app_id) {
|
if (ssd->state.app_id) {
|
||||||
zfree(ssd->state.app_id);
|
zfree(ssd->state.app_id);
|
||||||
}
|
}
|
||||||
if (ssd->state.icon_img) {
|
|
||||||
lab_img_destroy(ssd->state.icon_img);
|
|
||||||
}
|
|
||||||
|
|
||||||
wlr_scene_node_destroy(&ssd->titlebar.tree->node);
|
wlr_scene_node_destroy(&ssd->titlebar.tree->node);
|
||||||
ssd->titlebar.tree = NULL;
|
ssd->titlebar.tree = NULL;
|
||||||
|
|
@ -642,10 +639,7 @@ ssd_update_window_icon(struct ssd *ssd)
|
||||||
}
|
}
|
||||||
} FOR_EACH_END
|
} FOR_EACH_END
|
||||||
|
|
||||||
if (ssd->state.icon_img) {
|
lab_img_drop(icon_img);
|
||||||
lab_img_destroy(ssd->state.icon_img);
|
|
||||||
}
|
|
||||||
ssd->state.icon_img = icon_img;
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1515,7 +1515,7 @@ theme_init(struct theme *theme, struct server *server, const char *theme_name)
|
||||||
|
|
||||||
static void destroy_img(struct lab_img **img)
|
static void destroy_img(struct lab_img **img)
|
||||||
{
|
{
|
||||||
lab_img_destroy(*img);
|
lab_img_drop(*img);
|
||||||
*img = NULL;
|
*img = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue