From patchwork Sun Dec 29 17:26:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 182568 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5466425ild; Sun, 29 Dec 2019 09:55:08 -0800 (PST) X-Google-Smtp-Source: APXvYqyxVnF39T4c1wWnGoVWUtf5W4OZufqunNSzVvMjHiOH83xu1ldNAC/1duJ6kEOhHw4CM/VX X-Received: by 2002:a9d:65cb:: with SMTP id z11mr49123679oth.348.1577642108529; Sun, 29 Dec 2019 09:55:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577642108; cv=none; d=google.com; s=arc-20160816; b=LhZujZ4IaD3QghFfzDjDWkTq4hVeqCYs4jzj3lXiWgZJgA84eVscIdbblTWqmrXN1/ 8BZqNOWbpN+VMjHeSxeE0wQg0oqjr1Zi2ASWa4a9b9sI3AKtIsRXb7d4k8FEaXGSpC1n RR3nwXc4lEyQdE1sN2KhV4JtpnfYmHPIyhySJoeYHZ3GXzjpbYORifHRkjCdBRyymY0+ FI8gq4wsIKI6A4cJEVacnnmn5Sty5fatEpZnFvFDUT7/D1mCmeaZSko/tM2VjI2MYmxn HzQxA/WESEERA/E9+YkT9Lj1WZXeQ3TfSbC/ZdtePyjqEsZ3hRlyo5jk4xwjff/8eWNg WNSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vczm2NFtwPwn+WHKCPkXMIqh4Ly9qxYbK/lGqMHwCbU=; b=jgWrrxNFBTItg0Nqr76TkNKmze/qZIEGcOf6H2gEwC3zdeJn40b1UPGEDauHhY7fBl IF2brbgXBEeC/g734vUN1xxe+S0CAxdh6beSaQkK3f+Jg8KDj0+7Z5Fe0pt4/a2jjDh9 RI4Ro7vXnY8aqTCAvhIqbTzq9jPanqU/TaXZ/LB3o2DkCEQZ0IcWqhD4VS8ZF5CKBlsQ jjdzQMC/N4GHZ+tV2OaMxTr5nYaHSCABH7OG9Rfy4FDQTpZsmPODMBuy3beRlfCruGGy uyZsCQG4MYoGPy76mqp0VCQG/yyrkr2eSDZbWVptOd8T+d53tTm/ofRmQfRkM/muRGD4 dbhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fi4c4LQe; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y9si12837639oiy.81.2019.12.29.09.55.08; Sun, 29 Dec 2019 09:55:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fi4c4LQe; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732801AbfL2RzH (ORCPT + 14 others); Sun, 29 Dec 2019 12:55:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:43528 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732830AbfL2RzG (ORCPT ); Sun, 29 Dec 2019 12:55:06 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6178E206A4; Sun, 29 Dec 2019 17:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642105; bh=OMmq0E4JQP23vd/LKxRBWu2Ka5C0HriFypktdNcNkHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fi4c4LQeCT+XK3AR9ezdvJEnrJTb7wEfotMVh09ceTl6c7J31Hex3KJ2cESCHaeEW YRM4aT+/Evos8lArEZMFsSshAynSY5lmy163gidSBzPsgsQkIno48Y41/U/5K1Kv7w whzk3/xRAcwGu977ct94/2Bl5JQz945bHx3e9C+4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Corentin Labbe , Herbert Xu , Sasha Levin Subject: [PATCH 5.4 344/434] crypto: sun4i-ss - Fix 64-bit size_t warnings on sun4i-ss-hash.c Date: Sun, 29 Dec 2019 18:26:37 +0100 Message-Id: <20191229172724.820528050@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Corentin Labbe [ Upstream commit a7126603d46fe8f01aeedf589e071c6aaa6c6c39 ] If you try to compile this driver on a 64-bit platform then you will get warnings because it mixes size_t with unsigned int which only works on 32-bit. This patch fixes all of the warnings on sun4i-ss-hash.c. Signed-off-by: Corentin Labbe Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c index fcffba5ef927..1369c5fa3087 100644 --- a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c +++ b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c @@ -272,8 +272,8 @@ static int sun4i_hash(struct ahash_request *areq) */ while (op->len < 64 && i < end) { /* how many bytes we can read from current SG */ - in_r = min3(mi.length - in_i, end - i, - 64 - op->len); + in_r = min(end - i, 64 - op->len); + in_r = min_t(size_t, mi.length - in_i, in_r); memcpy(op->buf + op->len, mi.addr + in_i, in_r); op->len += in_r; i += in_r; @@ -293,8 +293,8 @@ static int sun4i_hash(struct ahash_request *areq) } if (mi.length - in_i > 3 && i < end) { /* how many bytes we can read from current SG */ - in_r = min3(mi.length - in_i, areq->nbytes - i, - ((mi.length - in_i) / 4) * 4); + in_r = min_t(size_t, mi.length - in_i, areq->nbytes - i); + in_r = min_t(size_t, ((mi.length - in_i) / 4) * 4, in_r); /* how many bytes we can write in the device*/ todo = min3((u32)(end - i) / 4, rx_cnt, (u32)in_r / 4); writesl(ss->base + SS_RXFIFO, mi.addr + in_i, todo); @@ -320,8 +320,8 @@ static int sun4i_hash(struct ahash_request *areq) if ((areq->nbytes - i) < 64) { while (i < areq->nbytes && in_i < mi.length && op->len < 64) { /* how many bytes we can read from current SG */ - in_r = min3(mi.length - in_i, areq->nbytes - i, - 64 - op->len); + in_r = min(areq->nbytes - i, 64 - op->len); + in_r = min_t(size_t, mi.length - in_i, in_r); memcpy(op->buf + op->len, mi.addr + in_i, in_r); op->len += in_r; i += in_r;