0003-a-ulaw-fix-multiple-buffer-overflows-432.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596
  1. From 8ddc442d539ca775d80cdbc7af17a718634a743f Mon Sep 17 00:00:00 2001
  2. From: Hugo Lefeuvre <hle@owl.eu.com>
  3. Date: Mon, 24 Dec 2018 06:43:48 +0100
  4. Subject: [PATCH] a/ulaw: fix multiple buffer overflows (#432)
  5. i2ulaw_array() and i2alaw_array() fail to handle ptr [count] = INT_MIN
  6. properly, leading to buffer underflow. INT_MIN is a special value
  7. since - INT_MIN cannot be represented as int.
  8. In this case round - INT_MIN to INT_MAX and proceed as usual.
  9. f2ulaw_array() and f2alaw_array() fail to handle ptr [count] = NaN
  10. properly, leading to null pointer dereference.
  11. In this case, arbitrarily set the buffer value to 0.
  12. This commit fixes #429 (CVE-2018-19661 and CVE-2018-19662) and
  13. fixes #344 (CVE-2017-17456 and CVE-2017-17457).
  14. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  15. ---
  16. src/alaw.c | 9 +++++++--
  17. src/ulaw.c | 9 +++++++--
  18. 2 files changed, 14 insertions(+), 4 deletions(-)
  19. diff --git a/src/alaw.c b/src/alaw.c
  20. index 063fd1a2..4220224c 100644
  21. --- a/src/alaw.c
  22. +++ b/src/alaw.c
  23. @@ -19,6 +19,7 @@
  24. #include "sfconfig.h"
  25. #include <math.h>
  26. +#include <limits.h>
  27. #include "sndfile.h"
  28. #include "common.h"
  29. @@ -326,7 +327,9 @@ s2alaw_array (const short *ptr, int count, unsigned char *buffer)
  30. static inline void
  31. i2alaw_array (const int *ptr, int count, unsigned char *buffer)
  32. { while (--count >= 0)
  33. - { if (ptr [count] >= 0)
  34. + { if (ptr [count] == INT_MIN)
  35. + buffer [count] = alaw_encode [INT_MAX >> (16 + 4)] ;
  36. + else if (ptr [count] >= 0)
  37. buffer [count] = alaw_encode [ptr [count] >> (16 + 4)] ;
  38. else
  39. buffer [count] = 0x7F & alaw_encode [- ptr [count] >> (16 + 4)] ;
  40. @@ -346,7 +349,9 @@ f2alaw_array (const float *ptr, int count, unsigned char *buffer, float normfact
  41. static inline void
  42. d2alaw_array (const double *ptr, int count, unsigned char *buffer, double normfact)
  43. { while (--count >= 0)
  44. - { if (ptr [count] >= 0)
  45. + { if (!isfinite (ptr [count]))
  46. + buffer [count] = 0 ;
  47. + else if (ptr [count] >= 0)
  48. buffer [count] = alaw_encode [lrint (normfact * ptr [count])] ;
  49. else
  50. buffer [count] = 0x7F & alaw_encode [- lrint (normfact * ptr [count])] ;
  51. diff --git a/src/ulaw.c b/src/ulaw.c
  52. index e50b4cb5..b6070ade 100644
  53. --- a/src/ulaw.c
  54. +++ b/src/ulaw.c
  55. @@ -19,6 +19,7 @@
  56. #include "sfconfig.h"
  57. #include <math.h>
  58. +#include <limits.h>
  59. #include "sndfile.h"
  60. #include "common.h"
  61. @@ -827,7 +828,9 @@ s2ulaw_array (const short *ptr, int count, unsigned char *buffer)
  62. static inline void
  63. i2ulaw_array (const int *ptr, int count, unsigned char *buffer)
  64. { while (--count >= 0)
  65. - { if (ptr [count] >= 0)
  66. + { if (ptr [count] == INT_MIN)
  67. + buffer [count] = ulaw_encode [INT_MAX >> (16 + 2)] ;
  68. + else if (ptr [count] >= 0)
  69. buffer [count] = ulaw_encode [ptr [count] >> (16 + 2)] ;
  70. else
  71. buffer [count] = 0x7F & ulaw_encode [-ptr [count] >> (16 + 2)] ;
  72. @@ -847,7 +850,9 @@ f2ulaw_array (const float *ptr, int count, unsigned char *buffer, float normfact
  73. static inline void
  74. d2ulaw_array (const double *ptr, int count, unsigned char *buffer, double normfact)
  75. { while (--count >= 0)
  76. - { if (ptr [count] >= 0)
  77. + { if (!isfinite (ptr [count]))
  78. + buffer [count] = 0 ;
  79. + else if (ptr [count] >= 0)
  80. buffer [count] = ulaw_encode [lrint (normfact * ptr [count])] ;
  81. else
  82. buffer [count] = 0x7F & ulaw_encode [- lrint (normfact * ptr [count])] ;
  83. --
  84. 2.11.0