Attachment 239973 Details for Bug 269390 – Patch for tmux

[patch] Patch for tmux

tmux-33a-cve.patch (text/plain), 3.17 KB, created by Daniel Engberg on 2023-02-07 17:57:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-02-07 17:57:56 UTC

Size: 3.17 KB

patch

obsolete

>diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
>index f8550ef4c2d2..ad6a518b40f4 100644
>--- a/sysutils/tmux/Makefile
>+++ b/sysutils/tmux/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	tmux
> PORTVERSION=	3.3a
>+PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>diff --git a/sysutils/tmux/distinfo b/sysutils/tmux/distinfo
>index 37cd29fb5bdc..723a440b43f4 100644
>--- a/sysutils/tmux/distinfo
>+++ b/sysutils/tmux/distinfo
>@@ -1,5 +1,7 @@
>-TIMESTAMP = 1657892731
>+TIMESTAMP = 1675792095
> SHA256 (tmux-3.3a.tar.gz) = e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f
> SIZE (tmux-3.3a.tar.gz) = 677448
> SHA256 (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 4e4f791c446e3cab1a02d39a30fbfd4cec6c7e3119365860a04c9de205eaa626
> SIZE (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 8726
>+SHA256 (e86752820993a00e3d28350cbe46878ba95d9012.patch) = 0770e20eea3eeeff5b81a1d0311d7862f027982867a540b50cf47e37541f5778
>+SIZE (e86752820993a00e3d28350cbe46878ba95d9012.patch) = 2108
>diff --git a/sysutils/tmux/files/patch-cve_2022-47016 b/sysutils/tmux/files/patch-cve_2022-47016
>new file mode 100644
>index 000000000000..1c8d2532bb77
>--- /dev/null
>+++ b/sysutils/tmux/files/patch-cve_2022-47016
>@@ -0,0 +1,58 @@
>+Index: control.c
>+===================================================================
>+--- control.c
>++++ control.c
>+@@ -775,6 +775,9 @@ control_start(struct client *c)
>+ 
>+ 	cs->read_event = bufferevent_new(c->fd, control_read_callback,
>+ 	    control_write_callback, control_error_callback, c);
>++	if (cs->read_event == NULL)
>++		fatalx("out of memory");
>++
>+ 	bufferevent_enable(cs->read_event, EV_READ);
>+ 
>+ 	if (c->flags & CLIENT_CONTROLCONTROL)
>+@@ -782,6 +785,8 @@ control_start(struct client *c)
>+ 	else {
>+ 		cs->write_event = bufferevent_new(c->out_fd, NULL,
>+ 		    control_write_callback, control_error_callback, c);
>++		if (cs->write_event == NULL)
>++			fatalx("out of memory");
>+ 	}
>+ 	bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW,
>+ 	    0);
>+Index: file.c
>+===================================================================
>+--- file.c
>++++ file.c
>+@@ -585,6 +585,8 @@ file_write_open(struct client_files *fil
>+ 
>+ 	cf->event = bufferevent_new(cf->fd, NULL, file_write_callback,
>+ 	    file_write_error_callback, cf);
>++	if (cf->event == NULL)
>++		fatalx("out of memory");
>+ 	bufferevent_enable(cf->event, EV_WRITE);
>+ 	goto reply;
>+ 
>+@@ -744,6 +746,8 @@ file_read_open(struct client_files *file
>+ 
>+ 	cf->event = bufferevent_new(cf->fd, file_read_callback, NULL,
>+ 	    file_read_error_callback, cf);
>++	if (cf->event == NULL)
>++		fatalx("out of memory");
>+ 	bufferevent_enable(cf->event, EV_READ);
>+ 	return;
>+ 
>+Index: window.c
>+===================================================================
>+--- window.c
>++++ window.c
>+@@ -1042,6 +1042,8 @@ window_pane_set_event(struct window_pane
>+ 
>+ 	wp->event = bufferevent_new(wp->fd, window_pane_read_callback,
>+ 	    NULL, window_pane_error_callback, wp);
>++	if (wp->event == NULL)
>++		fatalx("out of memory");
>+ 	wp->ictx = input_init(wp, wp->event, &wp->palette);
>+ 
>+ 	bufferevent_enable(wp->event, EV_READ|EV_WRITE);

Actions: View | Diff

Attachments on bug 269390: 239973