From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97385C433E0 for ; Mon, 15 Jun 2020 23:22:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D58A2074D for ; Mon, 15 Jun 2020 23:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592263354; bh=yRenNfLGBx82R7EvFHNRnPyeS6IINAWAcDUdMCjxrNQ=; h=Date:From:To:Cc:Subject:List-ID:From; b=jiZXRyBmmIO5lVn4zAGWr/2+ZPgdDhxPVXmp+CqbcekxBNcOqGQgT4479pE0E2V1W yM3qzFgYqh5Wi0Tuv9aASWVu7q2rzpCMocnCxfHnuN62S+uNWwGcpCuiAuiXC8vKW9 TlOyb/N5u+29kx2YQrXiSbwgqGWcT3q5sgCcX1FY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726674AbgFOXWd (ORCPT ); Mon, 15 Jun 2020 19:22:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:40742 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726313AbgFOXWc (ORCPT ); Mon, 15 Jun 2020 19:22:32 -0400 Received: from embeddedor (unknown [189.207.59.248]) (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 EA73C20739; Mon, 15 Jun 2020 23:22:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592263352; bh=yRenNfLGBx82R7EvFHNRnPyeS6IINAWAcDUdMCjxrNQ=; h=Date:From:To:Cc:Subject:From; b=Nzn3Wgj9LiW6vn0Y4F5TMX86XXUeq6jo/rssL9AdopJ2o8J/qy658kHZ44Cu1J8b+ T3dWfSuijn7yf84ocAorzN4rq2Au5EaA8xGYDalcpcBrM5xZcBFqTU84IeQHYe+QQ3 hEuj4y7sN8Xehd43csympDErpLxK8fFnNl6Ad+mo= Date: Mon, 15 Jun 2020 18:27:51 -0500 From: "Gustavo A. R. Silva" To: David Howells Cc: linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , Kees Cook Subject: [PATCH][next] afs: Use array3_size() helper in afs_extract_to_buf() Message-ID: <20200615232751.GA22366@embeddedor> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use array3_size() helper instead of the open-coded version in afs_extract_to_buf(). These sorts of multiplication factors need to be wrapped in array3_size(). This issue was found with the help of Coccinelle and, audited and fixed manually. Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83 Signed-off-by: Gustavo A. R. Silva --- fs/afs/cmservice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c index bef413818af7..4d086f9c829e 100644 --- a/fs/afs/cmservice.c +++ b/fs/afs/cmservice.c @@ -268,7 +268,7 @@ static int afs_deliver_cb_callback(struct afs_call *call) GFP_KERNEL); if (!call->buffer) return -ENOMEM; - afs_extract_to_buf(call, call->count * 3 * 4); + afs_extract_to_buf(call, array3_size(call->count, 3, 4)); call->unmarshall++; /* Fall through */ -- 2.27.0