From patchwork Sun Dec 7 12:26:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Spelvin X-Patchwork-Id: 5451471 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1E3749F507 for ; Sun, 7 Dec 2014 12:27:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 491AA20154 for ; Sun, 7 Dec 2014 12:27:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76DFE2015E for ; Sun, 7 Dec 2014 12:27:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753175AbaLGM1F (ORCPT ); Sun, 7 Dec 2014 07:27:05 -0500 Received: from ns.horizon.com ([71.41.210.147]:35612 "HELO ns.horizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753183AbaLGM1E (ORCPT ); Sun, 7 Dec 2014 07:27:04 -0500 Received: (qmail 20865 invoked by uid 1000); 7 Dec 2014 07:26:55 -0500 From: George Spelvin To: nhorman@tuxdriver.com, linux-crypto@vger.kernel.org Cc: smueller@chronox.de, herbert@gondor.apana.org.au, linux@horizon.com Subject: [PATCH v2 17/25] crypto: testmgr - Don't crash if CPRNG test result is large Date: Sun, 7 Dec 2014 07:26:25 -0500 Message-Id: X-Mailer: git-send-email 2.1.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The idea is to catch as many programmer mistakes as possible. Signed-off-by: George Spelvin --- crypto/testmgr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 9faf265f..6bf43682 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -1459,6 +1459,11 @@ static int test_cprng(struct crypto_rng *tfm, u8 result[32]; for (i = 0; i < tcount; i++) { + if (template[i].rlen > sizeof(result)) { + printk(KERN_CRIT "alg: cprng: Cannot test %s\n", algo); + err = -EOVERFLOW; + break; + } memset(result, 0, sizeof result); err = crypto_rng_reset(tfm, template[i].seed, template[i].slen);