Re: [OE-core] [poky][dunfell][PATCH] glibc: Add and modify CVEs

2021-03-22 Thread saloni 
Hello Raj,

Yes, checked the discussion and patch on the mailing list in the evening.
https://lists.openembedded.org/g/openembedded-core/topic/dunfell_patch_glibc_pull/81482348?p=,,,20,0,0,0::recentpostdate%2Fsticky,,,20,2,40,81482348

Updating to latest 2.31 version will make the below patches obsolete and will 
be whitelisted, hence below changes can be ignored.

Thanks & Regards,
Saloni Jain

From: Khem Raj 
Sent: Monday, March 22, 2021 9:58 PM
To: Saloni Jain ; 
openembedded-core@lists.openembedded.org 

Cc: Nisha Parrakat 
Subject: Re: [poky][dunfell][PATCH] glibc: Add and modify CVEs

There is another patch on mailing lists to update to latest 2.31 which
should perhaps address these ?

On 3/22/21 3:27 AM, Saloni Jain wrote:
> Below patch is modified:
> 1. CVE-2019-25013
> The previous patch was modified for dunfell
> context and causing conflict for CVE-2021-3326.
> Hence, the original patch is backported.
> Link: 
> https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsecurity-tracker.debian.org%2Ftracker%2FCVE-2020-27618data=04%7C01%7CSaloni.Jain%40kpit.com%7C35f4f714238c416aff5c08d8ed4f7e7a%7C3539451eb46e4a26a242ff61502855c7%7C0%7C0%7C637520273080304204%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000sdata=6CnKJfxFf4NpxDANqbuB4wcc3tiRRNF5D%2FKBm18Dq%2FA%3Dreserved=0
> Link: 
> https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsourceware.org%2Fgit%2F%3Fp%3Dglibc.git%3Ba%3Dpatch%3Bh%3D9a99c682144bdbd40792ebf822fe9264e0376fb5data=04%7C01%7CSaloni.Jain%40kpit.com%7C35f4f714238c416aff5c08d8ed4f7e7a%7C3539451eb46e4a26a242ff61502855c7%7C0%7C0%7C637520273080314201%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000sdata=is4p3gAjo7AJjCtWRldupysJakNlQWLhkxaxNcIPvMI%3Dreserved=0
>
> Below patch is added:
> 1. CVE-2021-3326
> Link: 
> https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.redhat.com%2Fshow_bug.cgi%3Fid%3D1932589data=04%7C01%7CSaloni.Jain%40kpit.com%7C35f4f714238c416aff5c08d8ed4f7e7a%7C3539451eb46e4a26a242ff61502855c7%7C0%7C0%7C637520273080314201%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000sdata=QIfO6Z9aDldMkDe4nTGwPJO0bF%2F0ovXj%2FEk3nio62sU%3Dreserved=0
> Link: 
> https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsourceware.org%2Fgit%2F%3Fp%3Dglibc.git%3Ba%3Dpatch%3Bh%3Ddca565886b5e8bd7966e15f0ca42ee5cff686673data=04%7C01%7CSaloni.Jain%40kpit.com%7C35f4f714238c416aff5c08d8ed4f7e7a%7C3539451eb46e4a26a242ff61502855c7%7C0%7C0%7C637520273080314201%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000sdata=xNOEDHc6hkgt4hYNZ5pHanGB9bLrpoUSqda33FAoldI%3Dreserved=0
>
> Signed-off-by: Saloni Jain 
> ---
>   .../glibc/glibc/CVE-2019-25013.patch  |  52 +--
>   .../glibc/glibc/CVE-2021-3326.patch   | 297 ++
>   meta/recipes-core/glibc/glibc_2.31.bb |   3 +-
>   3 files changed, 328 insertions(+), 24 deletions(-)
>   create mode 100644 meta/recipes-core/glibc/glibc/CVE-2021-3326.patch
>
> diff --git a/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch 
> b/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
> index 73df1da868..3e446f2818 100644
> --- a/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
> +++ b/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
> @@ -8,12 +8,14 @@ area and is not allowed.  The from_euc_kr function used to 
> skip two bytes
>   when told to skip over the unknown designation, potentially running over
>   the buffer end.
>
> -Upstream-Status: Backport 
> [https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsourceware.org%2Fgit%2F%3Fp%3Dglibc.git%3Ba%3Dpatch%3Bh%3Dee7a3144c9922808181009b7b3e50e852fb4999bdata=04%7C01%7CSaloni.Jain%40kpit.com%7C35f4f714238c416aff5c08d8ed4f7e7a%7C3539451eb46e4a26a242ff61502855c7%7C0%7C0%7C637520273080314201%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000sdata=R5euqxZd1HbzdIQR%2FVPoxa7NIHxIVEy1O%2FBQosTcZPo%3Dreserved=0]
>   CVE: CVE-2019-25013
> -Signed-off-by: Scott Murray 
> -[Refreshed for Dundell context; Makefile changes]
> -Signed-off-by: Armin Kuster 
> +Upstream Status: Backport 
> [https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsourceware.org%2Fgit%2F%3Fp%3Dglibc.git%3Ba%3Dpatch%3Bh%3Dee7a3144c9922808181009b7b3e50e852fb4999bdata=04%7C01%7CSaloni.Jain%40kpit.com%7C35f4f714238c416aff5c08d8ed4f7e7a%7C3539451eb46e4a26a242ff61502855c7%7C0%7C0%7C637520273080314201%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000sdata=R5euqxZd1HbzdIQR%2FVPoxa7NIHxIVEy1O%2FBQosTcZPo%3Dreserved=0]
> +Comment: No change in any hunk
>
> +The previous change was modified for dunfell context, causing conflict
> +for CVE-2021-3326. Hence, the original patch is backported.
> +
> +Signed-off-by: Saloni Jain 
>   ---

Re: [OE-core] [poky][dunfell][PATCH] glibc: Add and modify CVEs

2021-03-22 Thread Khem Raj 
There is another patch on mailing lists to update to latest 2.31 which 
should perhaps address these ?


On 3/22/21 3:27 AM, Saloni Jain wrote:

Below patch is modified:
1. CVE-2019-25013
The previous patch was modified for dunfell
context and causing conflict for CVE-2021-3326.
Hence, the original patch is backported.
Link: https://security-tracker.debian.org/tracker/CVE-2020-27618
Link: 
https://sourceware.org/git/?p=glibc.git;a=patch;h=9a99c682144bdbd40792ebf822fe9264e0376fb5

Below patch is added:
1. CVE-2021-3326
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1932589
Link: 
https://sourceware.org/git/?p=glibc.git;a=patch;h=dca565886b5e8bd7966e15f0ca42ee5cff686673

Signed-off-by: Saloni Jain 
---
  .../glibc/glibc/CVE-2019-25013.patch  |  52 +--
  .../glibc/glibc/CVE-2021-3326.patch   | 297 ++
  meta/recipes-core/glibc/glibc_2.31.bb |   3 +-
  3 files changed, 328 insertions(+), 24 deletions(-)
  create mode 100644 meta/recipes-core/glibc/glibc/CVE-2021-3326.patch

diff --git a/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch 
b/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
index 73df1da868..3e446f2818 100644
--- a/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
+++ b/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
@@ -8,12 +8,14 @@ area and is not allowed.  The from_euc_kr function used to 
skip two bytes
  when told to skip over the unknown designation, potentially running over
  the buffer end.

-Upstream-Status: Backport 
[https://sourceware.org/git/?p=glibc.git;a=patch;h=ee7a3144c9922808181009b7b3e50e852fb4999b]
  CVE: CVE-2019-25013
-Signed-off-by: Scott Murray 
-[Refreshed for Dundell context; Makefile changes]
-Signed-off-by: Armin Kuster 
+Upstream Status: Backport 
[https://sourceware.org/git/?p=glibc.git;a=patch;h=ee7a3144c9922808181009b7b3e50e852fb4999b]
+Comment: No change in any hunk

+The previous change was modified for dunfell context, causing conflict
+for CVE-2021-3326. Hence, the original patch is backported.
+
+Signed-off-by: Saloni Jain 
  ---
   iconvdata/Makefile  |  3 ++-
   iconvdata/bug-iconv13.c | 53 +
@@ -22,23 +24,25 @@ Signed-off-by: Armin Kuster 
   4 files changed, 59 insertions(+), 9 deletions(-)
   create mode 100644 iconvdata/bug-iconv13.c

-Index: git/iconvdata/Makefile
-===
 git.orig/iconvdata/Makefile
-+++ git/iconvdata/Makefile
-@@ -73,7 +73,7 @@ modules.so := $(addsuffix .so, $(modules
+diff --git a/iconvdata/Makefile b/iconvdata/Makefile
+index 4ec2741cdc..85009f3390 100644
+--- a/iconvdata/Makefile
 b/iconvdata/Makefile
+@@ -73,7 +73,8 @@
   ifeq (yes,$(build-shared))
   tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
 tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
  -  bug-iconv10 bug-iconv11 bug-iconv12
-+  bug-iconv10 bug-iconv11 bug-iconv12 bug-iconv13
++  bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4 \
++   bug-iconv13
   ifeq ($(have-thread-library),yes)
   tests += bug-iconv3
   endif
-Index: git/iconvdata/bug-iconv13.c
-===
+diff --git a/iconvdata/bug-iconv13.c b/iconvdata/bug-iconv13.c
+new file mode 100644
+index 00..87aaff398e
  --- /dev/null
-+++ git/iconvdata/bug-iconv13.c
 b/iconvdata/bug-iconv13.c
  @@ -0,0 +1,53 @@
  +/* bug 24973: Test EUC-KR module
  +   Copyright (C) 2020 Free Software Foundation, Inc.
@@ -93,11 +97,11 @@ Index: git/iconvdata/bug-iconv13.c
  +}
  +
  +#include 
-Index: git/iconvdata/euc-kr.c
-===
 git.orig/iconvdata/euc-kr.c
-+++ git/iconvdata/euc-kr.c
-@@ -80,11 +80,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned c
+diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
+index b0d56cf3ee..1045bae926 100644
+--- a/iconvdata/euc-kr.c
 b/iconvdata/euc-kr.c
+@@ -80,11 +80,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
   \
   if (ch <= 0x9f) \
 ++inptr;   
   \
@@ -110,11 +114,11 @@ Index: git/iconvdata/euc-kr.c
 {  
   \
 /* This is illegal.  */   \
 STANDARD_FROM_LOOP_ERR_HANDLER (1);   \
-Index: git/iconvdata/ksc5601.h
-===
 git.orig/iconvdata/ksc5601.h
-+++ git/iconvdata/ksc5601.h
-@@ -50,15 +50,15 @@ ksc5601_to_ucs4 (const unsigned char **s
+diff --git a/iconvdata/ksc5601.h b/iconvdata/ksc5601.h
+index d3eb3a4ff8..f5cdc72797 100644
+--- a/iconvdata/ksc5601.h

[OE-core] [poky][dunfell][PATCH] glibc: Add and modify CVEs

2021-03-22 Thread saloni 
Below patch is modified:
1. CVE-2019-25013
The previous patch was modified for dunfell
context and causing conflict for CVE-2021-3326.
Hence, the original patch is backported.
Link: https://security-tracker.debian.org/tracker/CVE-2020-27618
Link: 
https://sourceware.org/git/?p=glibc.git;a=patch;h=9a99c682144bdbd40792ebf822fe9264e0376fb5

Below patch is added:
1. CVE-2021-3326
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1932589
Link: 
https://sourceware.org/git/?p=glibc.git;a=patch;h=dca565886b5e8bd7966e15f0ca42ee5cff686673

Signed-off-by: Saloni Jain 
---
 .../glibc/glibc/CVE-2019-25013.patch  |  52 +--
 .../glibc/glibc/CVE-2021-3326.patch   | 297 ++
 meta/recipes-core/glibc/glibc_2.31.bb |   3 +-
 3 files changed, 328 insertions(+), 24 deletions(-)
 create mode 100644 meta/recipes-core/glibc/glibc/CVE-2021-3326.patch

diff --git a/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch 
b/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
index 73df1da868..3e446f2818 100644
--- a/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
+++ b/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
@@ -8,12 +8,14 @@ area and is not allowed.  The from_euc_kr function used to 
skip two bytes
 when told to skip over the unknown designation, potentially running over
 the buffer end.

-Upstream-Status: Backport 
[https://sourceware.org/git/?p=glibc.git;a=patch;h=ee7a3144c9922808181009b7b3e50e852fb4999b]
 CVE: CVE-2019-25013
-Signed-off-by: Scott Murray 
-[Refreshed for Dundell context; Makefile changes]
-Signed-off-by: Armin Kuster 
+Upstream Status: Backport 
[https://sourceware.org/git/?p=glibc.git;a=patch;h=ee7a3144c9922808181009b7b3e50e852fb4999b]
+Comment: No change in any hunk

+The previous change was modified for dunfell context, causing conflict
+for CVE-2021-3326. Hence, the original patch is backported.
+
+Signed-off-by: Saloni Jain 
 ---
  iconvdata/Makefile  |  3 ++-
  iconvdata/bug-iconv13.c | 53 +
@@ -22,23 +24,25 @@ Signed-off-by: Armin Kuster 
  4 files changed, 59 insertions(+), 9 deletions(-)
  create mode 100644 iconvdata/bug-iconv13.c

-Index: git/iconvdata/Makefile
-===
 git.orig/iconvdata/Makefile
-+++ git/iconvdata/Makefile
-@@ -73,7 +73,7 @@ modules.so := $(addsuffix .so, $(modules
+diff --git a/iconvdata/Makefile b/iconvdata/Makefile
+index 4ec2741cdc..85009f3390 100644
+--- a/iconvdata/Makefile
 b/iconvdata/Makefile
+@@ -73,7 +73,8 @@
  ifeq (yes,$(build-shared))
  tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
 -  bug-iconv10 bug-iconv11 bug-iconv12
-+  bug-iconv10 bug-iconv11 bug-iconv12 bug-iconv13
++  bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4 \
++   bug-iconv13
  ifeq ($(have-thread-library),yes)
  tests += bug-iconv3
  endif
-Index: git/iconvdata/bug-iconv13.c
-===
+diff --git a/iconvdata/bug-iconv13.c b/iconvdata/bug-iconv13.c
+new file mode 100644
+index 00..87aaff398e
 --- /dev/null
-+++ git/iconvdata/bug-iconv13.c
 b/iconvdata/bug-iconv13.c
 @@ -0,0 +1,53 @@
 +/* bug 24973: Test EUC-KR module
 +   Copyright (C) 2020 Free Software Foundation, Inc.
@@ -93,11 +97,11 @@ Index: git/iconvdata/bug-iconv13.c
 +}
 +
 +#include 
-Index: git/iconvdata/euc-kr.c
-===
 git.orig/iconvdata/euc-kr.c
-+++ git/iconvdata/euc-kr.c
-@@ -80,11 +80,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned c
+diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
+index b0d56cf3ee..1045bae926 100644
+--- a/iconvdata/euc-kr.c
 b/iconvdata/euc-kr.c
+@@ -80,11 +80,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
  \
  if (ch <= 0x9f) \
++inptr;
  \
@@ -110,11 +114,11 @@ Index: git/iconvdata/euc-kr.c
{   
  \
/* This is illegal.  */   \
STANDARD_FROM_LOOP_ERR_HANDLER (1);   \
-Index: git/iconvdata/ksc5601.h
-===
 git.orig/iconvdata/ksc5601.h
-+++ git/iconvdata/ksc5601.h
-@@ -50,15 +50,15 @@ ksc5601_to_ucs4 (const unsigned char **s
+diff --git a/iconvdata/ksc5601.h b/iconvdata/ksc5601.h
+index d3eb3a4ff8..f5cdc72797 100644
+--- a/iconvdata/ksc5601.h
 b/iconvdata/ksc5601.h
+@@ -50,15 +50,15 @@ ksc5601_to_ucs4 (const unsigned char **s, size_t avail, 
unsigned char offset)
unsigned char ch2;
int idx;

@@ -133,3 +137,5 @@ Index:

[OE-core] [poky][dunfell][PATCH] glibc: Add and modify CVEs

2021-03-22 Thread saloni 
Below patch is modified:
1. CVE-2019-25013
The previous patch was modified for dunfell
context and causing conflict for CVE-2021-3326.
Hence, the original patch is backported.
Link: https://security-tracker.debian.org/tracker/CVE-2020-27618
Link: 
https://sourceware.org/git/?p=glibc.git;a=patch;h=9a99c682144bdbd40792ebf822fe9264e0376fb5

Below patch is added:
1. CVE-2021-3326
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1932589
Link: 
https://sourceware.org/git/?p=glibc.git;a=patch;h=dca565886b5e8bd7966e15f0ca42ee5cff686673

Signed-off-by: Saloni Jain 
---
 .../glibc/glibc/CVE-2019-25013.patch  |  52 +--
 .../glibc/glibc/CVE-2021-3326.patch   | 297 ++
 meta/recipes-core/glibc/glibc_2.31.bb |   3 +-
 3 files changed, 328 insertions(+), 24 deletions(-)
 create mode 100644 meta/recipes-core/glibc/glibc/CVE-2021-3326.patch

diff --git a/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch 
b/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
index 73df1da868..3e446f2818 100644
--- a/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
+++ b/meta/recipes-core/glibc/glibc/CVE-2019-25013.patch
@@ -8,12 +8,14 @@ area and is not allowed.  The from_euc_kr function used to 
skip two bytes
 when told to skip over the unknown designation, potentially running over
 the buffer end.

-Upstream-Status: Backport 
[https://sourceware.org/git/?p=glibc.git;a=patch;h=ee7a3144c9922808181009b7b3e50e852fb4999b]
 CVE: CVE-2019-25013
-Signed-off-by: Scott Murray 
-[Refreshed for Dundell context; Makefile changes]
-Signed-off-by: Armin Kuster 
+Upstream Status: Backport 
[https://sourceware.org/git/?p=glibc.git;a=patch;h=ee7a3144c9922808181009b7b3e50e852fb4999b]
+Comment: No change in any hunk

+The previous change was modified for dunfell context, causing conflict
+for CVE-2021-3326. Hence, the original patch is backported.
+
+Signed-off-by: Saloni Jain 
 ---
  iconvdata/Makefile  |  3 ++-
  iconvdata/bug-iconv13.c | 53 +
@@ -22,23 +24,25 @@ Signed-off-by: Armin Kuster 
  4 files changed, 59 insertions(+), 9 deletions(-)
  create mode 100644 iconvdata/bug-iconv13.c

-Index: git/iconvdata/Makefile
-===
 git.orig/iconvdata/Makefile
-+++ git/iconvdata/Makefile
-@@ -73,7 +73,7 @@ modules.so := $(addsuffix .so, $(modules
+diff --git a/iconvdata/Makefile b/iconvdata/Makefile
+index 4ec2741cdc..85009f3390 100644
+--- a/iconvdata/Makefile
 b/iconvdata/Makefile
+@@ -73,7 +73,8 @@
  ifeq (yes,$(build-shared))
  tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
 -  bug-iconv10 bug-iconv11 bug-iconv12
-+  bug-iconv10 bug-iconv11 bug-iconv12 bug-iconv13
++  bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4 \
++   bug-iconv13
  ifeq ($(have-thread-library),yes)
  tests += bug-iconv3
  endif
-Index: git/iconvdata/bug-iconv13.c
-===
+diff --git a/iconvdata/bug-iconv13.c b/iconvdata/bug-iconv13.c
+new file mode 100644
+index 00..87aaff398e
 --- /dev/null
-+++ git/iconvdata/bug-iconv13.c
 b/iconvdata/bug-iconv13.c
 @@ -0,0 +1,53 @@
 +/* bug 24973: Test EUC-KR module
 +   Copyright (C) 2020 Free Software Foundation, Inc.
@@ -93,11 +97,11 @@ Index: git/iconvdata/bug-iconv13.c
 +}
 +
 +#include 
-Index: git/iconvdata/euc-kr.c
-===
 git.orig/iconvdata/euc-kr.c
-+++ git/iconvdata/euc-kr.c
-@@ -80,11 +80,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned c
+diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
+index b0d56cf3ee..1045bae926 100644
+--- a/iconvdata/euc-kr.c
 b/iconvdata/euc-kr.c
+@@ -80,11 +80,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
  \
  if (ch <= 0x9f) \
++inptr;
  \
@@ -110,11 +114,11 @@ Index: git/iconvdata/euc-kr.c
{   
  \
/* This is illegal.  */   \
STANDARD_FROM_LOOP_ERR_HANDLER (1);   \
-Index: git/iconvdata/ksc5601.h
-===
 git.orig/iconvdata/ksc5601.h
-+++ git/iconvdata/ksc5601.h
-@@ -50,15 +50,15 @@ ksc5601_to_ucs4 (const unsigned char **s
+diff --git a/iconvdata/ksc5601.h b/iconvdata/ksc5601.h
+index d3eb3a4ff8..f5cdc72797 100644
+--- a/iconvdata/ksc5601.h
 b/iconvdata/ksc5601.h
+@@ -50,15 +50,15 @@ ksc5601_to_ucs4 (const unsigned char **s, size_t avail, 
unsigned char offset)
unsigned char ch2;
int idx;

@@ -133,3 +137,5 @@ Index: