From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752081AbbJEWde (ORCPT ); Mon, 5 Oct 2015 18:33:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59120 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751256AbbJEWdd (ORCPT ); Mon, 5 Oct 2015 18:33:33 -0400 From: Laura Abbott To: Antti Palosaari , Mauro Carvalho Chehab , Olli Salonen Cc: Laura Abbott , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, stable@kernel.org Subject: [PATCHv2] si2157: Bounds check firmware Date: Mon, 5 Oct 2015 15:33:29 -0700 Message-Id: <1444084409-20259-1-git-send-email-labbott@fedoraproject.org> In-Reply-To: <5612F98D.4020000@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When reading the firmware and sending commands, the length must be bounds checked to avoid overrunning the size of the command buffer and smashing the stack if the firmware is not in the expected format. Add the proper check. Cc: stable@kernel.org Signed-off-by: Laura Abbott --- v2: Set the return code properly --- drivers/media/tuners/si2157.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c index 5073821..0e1ca2b 100644 --- a/drivers/media/tuners/si2157.c +++ b/drivers/media/tuners/si2157.c @@ -166,6 +166,11 @@ static int si2157_init(struct dvb_frontend *fe) for (remaining = fw->size; remaining > 0; remaining -= 17) { len = fw->data[fw->size - remaining]; + if (len > SI2157_ARGLEN) { + dev_err(&client->dev, "Bad firmware length\n"); + ret = -EINVAL; + goto err_release_firmware; + } memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len); cmd.wlen = len; cmd.rlen = 1; -- 2.4.3