diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-09 12:01:32 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-09 12:01:32 +0800 |
| commit | 7effd4c8ef8779ef8dcb90b5dc3dd38c12210c11 (patch) | |
| tree | c681a7f96d19a8163118f842f8dcd0a3c4520cb3 /lib | |
| parent | 2f68ef7576fc0a106d5cd77f31175fd498c9f995 (diff) | |
| parent | c54d0707aa09a824413ebb4195c98bfb9b9e1fc0 (diff) | |
Merge tag 'v4.4.97' into linux-linaro-lsk-v4.4
This is the 4.4.97 stable release
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asn1_decoder.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c index 554522934c44..faa2a3f017f8 100644 --- a/lib/asn1_decoder.c +++ b/lib/asn1_decoder.c @@ -283,6 +283,9 @@ next_op: if (unlikely(len > datalen - dp)) goto data_overrun_error; } + } else { + if (unlikely(len > datalen - dp)) + goto data_overrun_error; } if (flags & FLAG_CONS) { |