0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. Fix CVE-2015-6749 - invalid AIFF file causes alloca() buffer overflow.
  2. See https://trac.xiph.org/ticket/2212
  3. Status: upstream
  4. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  5. diff --git a/oggenc/audio.c b/oggenc/audio.c
  6. index 477da8c..4921fb9 100644
  7. --- a/oggenc/audio.c
  8. +++ b/oggenc/audio.c
  9. @@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] =
  10. int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
  11. {
  12. int aifc; /* AIFC or AIFF? */
  13. - unsigned int len;
  14. - unsigned char *buffer;
  15. + unsigned int len, readlen;
  16. + unsigned char buffer[22];
  17. unsigned char buf2[8];
  18. aiff_fmt format;
  19. aifffile *aiff = malloc(sizeof(aifffile));
  20. @@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
  21. return 0; /* Weird common chunk */
  22. }
  23. - buffer = alloca(len);
  24. -
  25. - if(fread(buffer,1,len,in) < len)
  26. + readlen = len < sizeof(buffer) ? len : sizeof(buffer);
  27. + if(fread(buffer,1,readlen,in) < readlen ||
  28. + (len > readlen && !seek_forward(in, len-readlen)))
  29. {
  30. fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
  31. return 0;
  32. --
  33. 2.5.0