From nobody Sun May 10 13:30:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFF9BC4332F for ; Tue, 3 May 2022 14:47:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237359AbiECOuf (ORCPT ); Tue, 3 May 2022 10:50:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229655AbiECOuc (ORCPT ); Tue, 3 May 2022 10:50:32 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4949835A9B for ; Tue, 3 May 2022 07:46:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651589217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=83wy3D5dt5Ummd3Bx/sB0t7+Cs+0z1iy7in3UM+60Qw=; b=LSD4YEz5FYf16kJAPdJ19vXP+nfSHMDV5360DBImXCSCRj50tpGKnQLr061vFBHju3rKOy Jb6ng1ZJXlNZSaAqDTHmOqBbP09ciaPRb5AIuSNG5sNdhGbyqnFEClSa7FmoPDQn5IKee5 eQ+UOGAmxA6cUfoulQFiYVch9PGoq0U= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-299-jgjTXxaaPv6ib_ZxI4jnfg-1; Tue, 03 May 2022 10:46:06 -0400 X-MC-Unique: jgjTXxaaPv6ib_ZxI4jnfg-1 Received: by mail-wm1-f72.google.com with SMTP id q6-20020a1cf306000000b0038c5726365aso850065wmq.3 for ; Tue, 03 May 2022 07:46:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=83wy3D5dt5Ummd3Bx/sB0t7+Cs+0z1iy7in3UM+60Qw=; b=ouu6jKU67XfdGgCkLYApUmw5D6nmGphRVfbkXU8qkuZBx9T3duXeP++MH62bKVL15g llW1cai/tHRw7npjX7mMGCBQBT+OMOqgNizNgYxLIYusquTA5KlRIc8H+NF+FNvzY819 u90M9jYj9L9ne65ZlUufP8ISW+9lmkUI6wKU4vlqfgOAMDSr5RjSSXNVPiJ5OpxhUnC4 ox99Vre68DgzMD9fqUtZ9lzAnyzfvIexMpVxHPYlj6a2SKBoielyKdUhrLc833l2FFbv qH2vqrd/COnGtTLDFbC2Bkuu1S77ugfZmVGyIR13CPNeN3uH0oCTgcLGS3OYUkr9FyK6 8oeQ== X-Gm-Message-State: AOAM532iJrH81CkKHTsl9gOYfhnEUDTabe5JG8UQdzlLsDFk8uP97PKb dIUILod+1KkRQQol4v6z05f9qeB9ddv4WkqEXxrgQrdM6A9VcZFTokHjCEgXy6ZVsuF5zt6e+gt Fs/VkTLciAn5qwWkrNxw72cPR X-Received: by 2002:a17:907:1623:b0:6e8:8678:640d with SMTP id hb35-20020a170907162300b006e88678640dmr15141677ejc.189.1651578613924; Tue, 03 May 2022 04:50:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgDSCmimGS4eep27PTOqrwdW6NzkICeJYxvlFa/x2oEMAH8qT4xJYqw/QzH9kG9LMxlrJyzA== X-Received: by 2002:a17:907:1623:b0:6e8:8678:640d with SMTP id hb35-20020a170907162300b006e88678640dmr15141658ejc.189.1651578613740; Tue, 03 May 2022 04:50:13 -0700 (PDT) Received: from localhost.localdomain ([2a02:8308:b106:e300:32b0:6ebb:8ca4:d4d3]) by smtp.gmail.com with ESMTPSA id m21-20020aa7c2d5000000b0042617ba6395sm7740445edp.31.2022.05.03.04.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 04:50:12 -0700 (PDT) From: Ondrej Mosnacek To: Andy Gross , Bjorn Andersson Cc: Herbert Xu , "David S. Miller" , Brian Masney , linux-arm-msm@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ Date: Tue, 3 May 2022 13:50:10 +0200 Message-Id: <20220503115010.1750296-1-omosnace@redhat.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The commit referenced in the Fixes tag removed the 'break' from the else branch in qcom_rng_read(), causing an infinite loop whenever 'max' is not a multiple of WORD_SZ. This can be reproduced e.g. by running: kcapi-rng -b 67 >/dev/null There are many ways to fix this without adding back the 'break', but they all seem more awkward than simply adding it back, so do just that. Tested on a machine with Qualcomm Amberwing processor. Fixes: a680b1832ced ("crypto: qcom-rng - ensure buffer for generate is comp= letely filled") Cc: stable@vger.kernel.org Signed-off-by: Ondrej Mosnacek Reviewed-by: Brian Masney --- drivers/crypto/qcom-rng.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c index 11f30fd48c141..031b5f701a0a3 100644 --- a/drivers/crypto/qcom-rng.c +++ b/drivers/crypto/qcom-rng.c @@ -65,6 +65,7 @@ static int qcom_rng_read(struct qcom_rng *rng, u8 *data, = unsigned int max) } else { /* copy only remaining bytes */ memcpy(data, &val, max - currsize); + break; } } while (currsize < max); =20 --=20 2.35.1