From patchwork Wed Nov 16 19:55:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1446 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp373426vsb; Wed, 16 Nov 2016 11:56:03 -0800 (PST) X-Received: by 10.194.172.42 with SMTP id az10mr3275642wjc.145.1479326163641; Wed, 16 Nov 2016 11:56:03 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ig4si34748080wjb.243.2016.11.16.11.56.03; Wed, 16 Nov 2016 11:56:03 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=QUARANTINE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7C71689CAB; Wed, 16 Nov 2016 21:55:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CD2A689C54 for ; Wed, 16 Nov 2016 21:55:54 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id m203so14537661wma.3 for ; Wed, 16 Nov 2016 11:55:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=L7oDjQraQ21m8b8Ijto/TgeS6g4aOr5M+gNqT+o/Qns=; b=chz3Pt1IxemCYFNstnsZ+BZMP+xYMDz4bVI7gd9ZHs9JQf88lUHbtnvyKPNvTBc+bT UdU5XdFjfZjTODEWZYutdmhvuInsNgynsoJPuOipKkgIBTONTuTxh9aHelF40KlWDhsb Oxx9oKNblpmKAi7sCn7zLKfZmL8euuVLwAwyKEdKmz3sl6/ftFwnegTezb0vvLMx61Zz NouUcEl8gY/Yq79uoZ7EAWKzZ6uI4a6CfnEEjHcZ4JN3gI5Z+JneXq09xhKAga4pRyQl 4Y6uaFcUk18fE+U/q0MRToqJBVgdbMHL1a75gTIC98XdF4HkLsRr3YEeau37Cve0ipAJ CqHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=L7oDjQraQ21m8b8Ijto/TgeS6g4aOr5M+gNqT+o/Qns=; b=Ctpqu26IPew8N7SDn9kcIXAqLx24YKLWieTqvBrnC4XH1tdstve1rrpfT13lU9cZWX kxsc0V9W5tmyNv2NJYFFkPGxAbn7PmRLEw8Vv01fwJMcJhzkypIfttbQzD1wAsi4vekn iCeri+PntOwuFQRa7PKpiLUg8p9K2VgZcsUqrwZH/y0jHc0qsdTAOAqlbKQNH0jOsCCR VhGRGoGY8xkAURkwNmHUjOrQuPJ0d4Iw9gyqvw6jYOtxA4aCybu/PCC5t18X+Y7ZprZc aBUWihA6DUxYxJawDvjiE0kfCeKhWPcSxDZHoDE7Sb9UcSGQsziAbFSEeY7ZZn56K/+j 77pg== X-Gm-Message-State: ABUngveLWMTUwSlBS5xydKAOJ3UCI0E+C3/gLWSlFPMZyQ96lb9Xnh8zmlXpytH8q9fMdg== X-Received: by 10.194.108.131 with SMTP id hk3mr3217105wjb.102.1479326154535; Wed, 16 Nov 2016 11:55:54 -0800 (PST) Received: from [192.168.2.21] (p5B072246.dip0.t-ipconnect.de. [91.7.34.70]) by smtp.googlemail.com with ESMTPSA id g17sm42273777wjs.38.2016.11.16.11.55.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Nov 2016 11:55:54 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <8088a842-01e8-1efb-90fc-febaa4b34ae6@googlemail.com> Date: Wed, 16 Nov 2016 20:55:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] exr: limit expected_len to tmp buffer size X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Paul B Mahol , Martin Vignali Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fixes crashes due to pointer corruption caused by invalid writes. The problem was introduced in commit 03152e74dfdc7f438cb4a10402c4de744e807e22. Signed-off-by: Andreas Cadhalpun --- libavcodec/exr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index c250eea..54869d2 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -841,6 +841,8 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t *src, } } + expected_len = FFMIN(expected_len, uncompressed_size); + dest_len = expected_len; if (uncompress(td->tmp, &dest_len, src, compressed_size) != Z_OK) {