From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5EE2C5DF60 for ; Fri, 8 Nov 2019 12:10:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82A252085B for ; Fri, 8 Nov 2019 12:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573215044; bh=z42NMZtRegQyAv3PPGmyHQ/taWk4UXkfZVgfVcUHReg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vxGgsA28Bt+usheZXjC03MY1wgqy+m0y2n5bQDOrY+Ha4dGXcNTzMGrp0lg60umS/ SqMNijKRm1Za1BdOmJl0YScMiicMVpznfdWb+Tz2HUPwEktwkUOMUHyg+qCv0UpDDY TuZKqd31q+gAvMSKa1aSKqP2c1SvZ9AnVWR0gI9w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387435AbfKHLj2 (ORCPT ); Fri, 8 Nov 2019 06:39:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:52116 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733122AbfKHLjK (ORCPT ); Fri, 8 Nov 2019 06:39:10 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 975EF222C2; Fri, 8 Nov 2019 11:39:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213150; bh=z42NMZtRegQyAv3PPGmyHQ/taWk4UXkfZVgfVcUHReg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kd9yJOdOfSy+ANIfAmpfTV/vNHkFRbxToUGg8vL0ldej2shjAl2N57T4+l3wNp06g BfF/wN4NTEf5DKAAivkU+VV0s6R2jSpyhZ9eTWWQdduYxEGzu69MPZwy1IiVtlvXfS pU8onYvDpoeMcseFaA0nFsfm9G9uFEA4a0bYSxc4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans Verkuil , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 059/205] media: vicodec: fix out-of-range values when decoding Date: Fri, 8 Nov 2019 06:35:26 -0500 Message-Id: <20191108113752.12502-59-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108113752.12502-1-sashal@kernel.org> References: <20191108113752.12502-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil [ Upstream commit be5a1509af8dd8a78fea24a35fe4a82d4cd0ae70 ] While decoding you need to make sure you do not get values < 0 or > 255. Note that since this code will also be used in userspace utilities the clamp macro isn't used since that is kernel-only. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/vicodec/vicodec-codec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/vicodec/vicodec-codec.c b/drivers/media/platform/vicodec/vicodec-codec.c index 2d047646f6147..d854b2344f12b 100644 --- a/drivers/media/platform/vicodec/vicodec-codec.c +++ b/drivers/media/platform/vicodec/vicodec-codec.c @@ -588,8 +588,14 @@ static void fill_decoder_block(u8 *dst, const s16 *input, int stride) int i, j; for (i = 0; i < 8; i++) { - for (j = 0; j < 8; j++) - *dst++ = *input++; + for (j = 0; j < 8; j++, input++, dst++) { + if (*input < 0) + *dst = 0; + else if (*input > 255) + *dst = 255; + else + *dst = *input; + } dst += stride - 8; } } -- 2.20.1