From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752896Ab1K1InZ (ORCPT ); Mon, 28 Nov 2011 03:43:25 -0500 Received: from va3ehsobe010.messaging.microsoft.com ([216.32.180.30]:25369 "EHLO VA3EHSOBE010.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752272Ab1K1InY (ORCPT ); Mon, 28 Nov 2011 03:43:24 -0500 X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: CIP:137.71.25.55;KIP:(null);UIP:(null);IPV:NLI;H:nwd2mta1.analog.com;RD:nwd2mail10.analog.com;EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail From: Lars-Peter Clausen To: Mark Brown , Liam Girdwood CC: Andrew Morton , Mike Frysinger , , , , Lars-Peter Clausen , Subject: [PATCH v2 2/7] firmware: Sigma: Skip header during CRC generation Date: Mon, 28 Nov 2011 09:44:15 +0100 Message-ID: <1322469860-8210-2-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1322469860-8210-1-git-send-email-lars@metafoo.de> References: <1322469860-8210-1-git-send-email-lars@metafoo.de> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The firmware header is not part of the CRC, so skip it. Otherwise the firmware will be rejected due to non-matching CRCs. Signed-off-by: Lars-Peter Clausen Cc: stable@kernel.org --- drivers/firmware/sigma.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/firmware/sigma.c b/drivers/firmware/sigma.c index c780baa..36265de 100644 --- a/drivers/firmware/sigma.c +++ b/drivers/firmware/sigma.c @@ -130,7 +130,8 @@ int process_sigma_firmware(struct i2c_client *client, const char *name) if (memcmp(ssfw_head->magic, SIGMA_MAGIC, ARRAY_SIZE(ssfw_head->magic))) goto done; - crc = crc32(0, fw->data, fw->size); + crc = crc32(0, fw->data + sizeof(*ssfw_head), + fw->size - sizeof(*ssfw_head)); pr_debug("%s: crc=%x\n", __func__, crc); if (crc != ssfw_head->crc) goto done; -- 1.7.7.3