diff options
| author | Arjun Shankar <arjun@redhat.com> | 2020-11-04 12:19:38 +0100 |
|---|---|---|
| committer | Fangrui Song <i@maskray.me> | 2021-08-27 17:26:08 -0700 |
| commit | 77d2c2fd0d8245ce729ae7d3ba97279a4afc845a (patch) | |
| tree | 20bb35c89496cf9198a7bd405b9d498a2203465f | |
| parent | 1a8e6a65626f17cb2547693a002b2877bebc8ddb (diff) | |
| download | glibc-77d2c2fd0d8245ce729ae7d3ba97279a4afc845a.tar.gz | |
iconv: Accept redundant shift sequences in IBM1364 [BZ #26224]
The IBM1364, IBM1371, IBM1388, IBM1390 and IBM1399 character sets
share converter logic (iconvdata/ibm1364.c) which would reject
redundant shift sequences when processing input in these character
sets. This led to a hang in the iconv program (CVE-2020-27618).
This commit adjusts the converter to ignore redundant shift sequences
and adds test cases for iconv_prog hangs that would be triggered upon
their rejection. This brings the implementation in line with other
converters that also ignore redundant shift sequences (e.g. IBM930
etc., fixed in commit 692de4b3960d).
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
| -rw-r--r-- | iconvdata/ibm1364.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c index b833273aa8..27900c4307 100644 --- a/iconvdata/ibm1364.c +++ b/iconvdata/ibm1364.c @@ -157,24 +157,14 @@ enum \ if (__builtin_expect (ch, 0) == SO) \ { \ - /* Shift OUT, change to DBCS converter. */ \ - if (curcs == db) \ - { \ - result = __GCONV_ILLEGAL_INPUT; \ - break; \ - } \ + /* Shift OUT, change to DBCS converter (redundant escape okay). */ \ curcs = db; \ ++inptr; \ continue; \ } \ if (__builtin_expect (ch, 0) == SI) \ { \ - /* Shift IN, change to SBCS converter. */ \ - if (curcs == sb) \ - { \ - result = __GCONV_ILLEGAL_INPUT; \ - break; \ - } \ + /* Shift IN, change to SBCS converter (redundant escape okay). */ \ curcs = sb; \ ++inptr; \ continue; \ |