From patchwork Tue May 19 10:45:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19769 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C67D544B01F for ; Tue, 19 May 2020 14:10:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98AE868A777; Tue, 19 May 2020 14:10:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 418D4680CAD for ; Tue, 19 May 2020 14:09:56 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id e16so15407067wra.7 for ; Tue, 19 May 2020 04:09:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hBuqMFgDYrmSdqw6N/AGTfKYyR35qJbUpx1rEImU6Fo=; b=PXRfy65JHy1eL/YKgIeCvjns0EXOFdAZMT6fFI1PhPpl27MvOCV4H+KAzM+wwf8nOQ kGAA7o+AlthnCUWbYTznNu/PErhz0eea4uzF4jCDsxmdxTvr53qC30lUGseol8PcrX7/ LkAMiFxtqByXZjGpvAngu4frNIUoR9Mf0nRJ8nxwjg9CnSAk4DhWwgV/KEJukA6s3yJY ZqTrD1nneii8omPoaPzsrNkpi9I5GT8GwRN958258kVKItUQDzgl2NgCYKASdeAAPvwl /xY8EW4AIgufFeIb9iGXkTng0Z3si1ZFBLTbC4r7/FJ1cF4k4lA+AgD6ODAHVplO8s2O oNdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hBuqMFgDYrmSdqw6N/AGTfKYyR35qJbUpx1rEImU6Fo=; b=DVXUkL31ag3TejNoOLSH8Bxl2GAJF7W77zeYe6wZkrjuEFOznaJHr/iYFMyi6W0c8O dLtpiSTyRNMwIyjFKdp4jZAHY+7di6CuAUAEHGZp0Mt3BIXqo+X8I0cRudLvwgw3az74 vlxXa3gxKH8Ncx5KRhQYfNc2TtbQXAknFHToZzV70yLHayb3opj4SVVOgpccyD8E37Fy 6jfbPp8N85EEjUeMh3EOgGb2s/RekaDD/bhQyerVWr2CJRs3/W4wpdef/AjTGP7YNHL7 5KEnhwDja6S/8zZQcl5T8HdSsAqbCeinjHPEZJoNdsN5BjO+bp2GXTXpigHy18m3x8Bm ejOQ== X-Gm-Message-State: AOAM533yi/Y/e63K7BU4OC5aJXUVJWQT35RoOv1De4WIRhqTpENdVEIU C0PCtiICm2SzhiyYEvDrzeUpxqSF X-Google-Smtp-Source: ABdhPJz97qpyA90CKBhc9D4j0ozIaTmIckaT3ys3KpqYJRgXhgTc5CcQ0P+9XcHG9fofY6ZcSU4qSw== X-Received: by 2002:a5d:5445:: with SMTP id w5mr24619010wrv.422.1589886595384; Tue, 19 May 2020 04:09:55 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m23sm3511998wmg.45.2020.05.19.04.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 04:09:54 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 May 2020 12:45:58 +0200 Message-Id: <20200519104601.12817-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519104601.12817-1-andreas.rheinhardt@gmail.com> References: <20200519104601.12817-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] checkasm/sw_scale: Fix stack-buffer-overflow 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" A buffer whose size is not a multiple of four has been initialized using consecutive writes of 32bits. This results in a stack-buffer-overflow reported by ASAN in the checkasm-sw_scale FATE-test. Signed-off-by: Andreas Rheinhardt --- Instead of using FFALIGN one could also just remove the "- 1" if that's preferred. tests/checkasm/sw_scale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c index 2680e47897..9efa2b4def 100644 --- a/tests/checkasm/sw_scale.c +++ b/tests/checkasm/sw_scale.c @@ -53,7 +53,7 @@ static void check_hscale(void) struct SwsContext *ctx; // padded - LOCAL_ALIGNED_32(uint8_t, src, [SRC_PIXELS + MAX_FILTER_WIDTH - 1]); + LOCAL_ALIGNED_32(uint8_t, src, [FFALIGN(SRC_PIXELS + MAX_FILTER_WIDTH - 1, 4)]); LOCAL_ALIGNED_32(uint32_t, dst0, [SRC_PIXELS]); LOCAL_ALIGNED_32(uint32_t, dst1, [SRC_PIXELS]);