vim: fix 2021-3796
PATCH v2 1/1 vim: fix 2021-3796
vim is vulnerable to Use After Free
Problem: Checking first character of url twice.
reference:
https://github.com/vim/vim/commit/35a9a00afcb20897d462a766793ff45534810dc3
--- .../vim/files/CVE-2021-3796.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 meta/recipes-support/vim/files/CVE-2021-3796.patch
meta/recipes-support/vim/files/CVE-2021-3796.patch new file +50 -0
@@ -0,0 +1,50 @@ +From 6d02e1429771c00046b48f26e53ca4123c3ce4e1 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar <[email protected]> +Date: Fri, 24 Sep 2021 16:01:09 +0800 +Subject: [PATCH] patch 8.2.3428: using freed memory when replacing + +Problem: Using freed memory when replacing. (Dhiraj Mishra) +Solution: Get the line pointer after calling ins_copychar(). + +Upstream-Status: Backport [https://github.com/vim/vim/commit/35a9a00afcb20897d462a766793ff45534810dc3] +CVE: CVE-2021-3796 + +Signed-off-by: Minjae Kim <[email protected]> +--- + src/normal.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/normal.c b/src/normal.c +index c4963e621..305b514bc 100644 +--- a/src/normal.c ++++ b/src/normal.c +@@ -5009,19 +5009,23 @@ nv_replace(cmdarg_T *cap) + { + /* + * Get ptr again, because u_save and/or showmatch() will have +- * released the line. At the same time we let know that the +- * line will be changed. ++ * released the line. This may also happen in ins_copychar(). ++ * At the same time we let know that the line will be changed. + */ +- ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y) + { + int c = ins_copychar(curwin->w_cursor.lnum + + (cap->nchar == Ctrl_Y ? -1 : 1)); ++ ++ ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + if (c != NUL) + ptr[curwin->w_cursor.col] = c; + } + else ++ { ++ ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + ptr[curwin->w_cursor.col] = cap->nchar; ++ } + if (p_sm && msg_silent == 0) + showmatch(cap->nchar); + ++curwin->w_cursor.col; +-- +2.17.1 +
Signature · 1 line
2.30.1 (Apple Git-130)
Quoted 4 lines · Minjae Kim
vim is vulnerable to Use After Free
Problem: Checking first character of url twice.
Quoted 8 lines
reference:
https://github.com/vim/vim/commit/35a9a00afcb20897d462a766793ff45534810dc3Signed-off-by Minjae Kim <[email protected]>--- .../vim/files/CVE-2021-3796.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 meta/recipes-support/vim/files/CVE-2021-3796.patch
You don't seem to be adding the patch to the SRC_URI in the recipe!
Steve
Quoted 69 lines
meta/recipes-support/vim/files/CVE-2021-3796.patch new file +50
-1@@ -0,0 +1,50 @@ +From 6d02e1429771c00046b48f26e53ca4123c3ce4e1 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar <[email protected]> +Date: Fri, 24 Sep 2021 16:01:09 +0800 +Subject: [PATCH] patch 8.2.3428: using freed memory when replacing + +Problem: Using freed memory when replacing. (Dhiraj Mishra) +Solution: Get the line pointer after calling ins_copychar(). + +Upstream-Status: Backport [https://github.com/vim/vim/commit/35a9a00afcb20897d462a766793ff45534810dc3] +CVE: CVE-2021-3796 + +Signed-off-by: Minjae Kim <[email protected]> +--- + src/normal.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/normal.c b/src/normal.c +index c4963e621..305b514bc 100644 +--- a/src/normal.c ++++ b/src/normal.c +@@ -5009,19 +5009,23 @@ nv_replace(cmdarg_T *cap) + { + /* + * Get ptr again, because u_save and/or showmatch() will have +- * released the line. At the same time we let know that the +- * line will be changed. ++ * released the line. This may also happen in ins_copychar(). ++ * At the same time we let know that the line will be changed. + */ +- ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y) + { + int c = ins_copychar(curwin->w_cursor.lnum + + (cap->nchar == Ctrl_Y ? -1 : 1)); ++ ++ ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + if (c != NUL) + ptr[curwin->w_cursor.col] = c; + } + else ++ { ++ ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + ptr[curwin->w_cursor.col] = cap->nchar; ++ } + if (p_sm && msg_silent == 0) + showmatch(cap->nchar); + ++curwin->w_cursor.col; +-- +2.17.1 + --2.30.1 (Apple Git-130)
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157332): https://lists.openembedded.org/g/openembedded-core/message/157332
Mute This Topic: https://lists.openembedded.org/mt/86572003/3620601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 9 lines · Steve Sakoman via lists.openembedded.org
Quoted 7 lines · Minjae Kim
vim is vulnerable to Use After Free
Problem: Checking first character of url twice.reference:
https://github.com/vim/vim/commit/35a9a00afcb20897d462a766793ff45534810dc3
Quoted 7 lines
Quoted 5 lines
Signed-off-by Minjae Kim <[email protected]>--- .../vim/files/CVE-2021-3796.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 meta/recipes-support/vim/files/CVE-2021-3796.patchYou don't seem to be adding the patch to the
SRC_URIin the recipe!
I fixed that issue, but now once again the patch file fails to apply:
stdio: ERROR: vim-8.2-r0 do_patch: Applying patch
'CVE-2021-3796.patch' on target directory '/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/vim/8.2-r0/git'
stdio: ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/vim/8.2-r0/temp/log.do_patch.7612
stdio: ERROR: Task (/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-support/vim/vim_8.2.bb:do_patch) failed with exit code '1'
Steve
Quoted 75 lines
Steve
Quoted 58 lines
meta/recipes-support/vim/files/CVE-2021-3796.patch new file +50
-1@@ -0,0 +1,50 @@ +From 6d02e1429771c00046b48f26e53ca4123c3ce4e1 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar <[email protected]> +Date: Fri, 24 Sep 2021 16:01:09 +0800 +Subject: [PATCH] patch 8.2.3428: using freed memory when replacing + +Problem: Using freed memory when replacing. (Dhiraj Mishra) +Solution: Get the line pointer after calling ins_copychar(). + +Upstream-Status: Backport [https://github.com/vim/vim/commit/35a9a00afcb20897d462a766793ff45534810dc3] +CVE: CVE-2021-3796 + +Signed-off-by: Minjae Kim <[email protected]> +--- + src/normal.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/normal.c b/src/normal.c +index c4963e621..305b514bc 100644 +--- a/src/normal.c ++++ b/src/normal.c +@@ -5009,19 +5009,23 @@ nv_replace(cmdarg_T *cap) + { + /* + * Get ptr again, because u_save and/or showmatch() will have +- * released the line. At the same time we let know that the +- * line will be changed. ++ * released the line. This may also happen in ins_copychar(). ++ * At the same time we let know that the line will be changed. + */ +- ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y) + { + int c = ins_copychar(curwin->w_cursor.lnum + + (cap->nchar == Ctrl_Y ? -1 : 1)); ++ ++ ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + if (c != NUL) + ptr[curwin->w_cursor.col] = c; + } + else ++ { ++ ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + ptr[curwin->w_cursor.col] = cap->nchar; ++ } + if (p_sm && msg_silent == 0) + showmatch(cap->nchar); + ++curwin->w_cursor.col; +-- +2.17.1 + --Quoted 5 lines
2.30.1 (Apple Git-130)
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157352): https://lists.openembedded.org/g/openembedded-core/message/157352
Mute This Topic: https://lists.openembedded.org/mt/86572003/3620601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 23 lines · Steve Sakoman via lists.openembedded.org
Quoted 9 lines · Steve Sakoman via lists.openembedded.org
Quoted 7 lines · Minjae Kim
vim is vulnerable to Use After Free
Problem: Checking first character of url twice.reference:
https://github.com/vim/vim/commit/35a9a00afcb20897d462a766793ff45534810dc3Quoted 7 lines
Quoted 5 lines
Signed-off-by Minjae Kim <[email protected]>--- .../vim/files/CVE-2021-3796.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 meta/recipes-support/vim/files/CVE-2021-3796.patchYou don't seem to be adding the patch to the
SRC_URIin the recipe!I fixed that issue, but now once again the patch file fails to apply:
Quoted 8 lines
stdio: ERROR: vim-8.2-r0
do_patch: Applying patch
'CVE-2021-3796.patch' on target directory '/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/vim/8.2-r0/git'
stdio: ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/no-x11/build/build/tmp/work/core2-64-poky-linux/vim/8.2-r0/temp/log.do_patch.7612
stdio: ERROR: Task (/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-support/vim/vim_8.2.bb:do_patch) failed with exit code '1'
Perhaps you are having some issues with your mailer that is corrupting the patch? I see that the master version is also having problems.
Do you have a git repo I could try pulling from?
Steve
Quoted 81 lines
Steve
Quoted 58 lines
Steve
Quoted 55 lines
meta/recipes-support/vim/files/CVE-2021-3796.patch new file +48
-0@@ -0,0 +1,50 @@ +From 6d02e1429771c00046b48f26e53ca4123c3ce4e1 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar <[email protected]> +Date: Fri, 24 Sep 2021 16:01:09 +0800 +Subject: [PATCH] patch 8.2.3428: using freed memory when replacing + +Problem: Using freed memory when replacing. (Dhiraj Mishra) +Solution: Get the line pointer after calling ins_copychar(). + +Upstream-Status: Backport [https://github.com/vim/vim/commit/35a9a00afcb20897d462a766793ff45534810dc3] +CVE: CVE-2021-3796 + +Signed-off-by: Minjae Kim <[email protected]> +--- + src/normal.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/normal.c b/src/normal.c +index c4963e621..305b514bc 100644 +--- a/src/normal.c ++++ b/src/normal.c +@@ -5009,19 +5009,23 @@ nv_replace(cmdarg_T *cap) + { + /* + * Get ptr again, because u_save and/or showmatch() will have +- * released the line. At the same time we let know that the +- * line will be changed. ++ * released the line. This may also happen in ins_copychar(). ++ * At the same time we let know that the line will be changed. + */ +- ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y) + { + int c = ins_copychar(curwin->w_cursor.lnum + + (cap->nchar == Ctrl_Y ? -1 : 1)); ++ ++ ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + if (c != NUL) + ptr[curwin->w_cursor.col] = c; + } + else ++ { ++ ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); + ptr[curwin->w_cursor.col] = cap->nchar; ++ } + if (p_sm && msg_silent == 0) + showmatch(cap->nchar); + ++curwin->w_cursor.col; +--Quoted 11 lines
Quoted 8 lines
meta/recipes-support/vim/files/CVE-2021-3796.patch new file +2
-1+2.17.1 + --2.30.1 (Apple Git-130)
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157353): https://lists.openembedded.org/g/openembedded-core/message/157353
Mute This Topic: https://lists.openembedded.org/mt/86572003/3620601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-