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=-14.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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 F0905C43331 for ; Tue, 24 Mar 2020 17:42:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9B8620714 for ; Tue, 24 Mar 2020 17:42:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="GJksm+dI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727755AbgCXRmG (ORCPT ); Tue, 24 Mar 2020 13:42:06 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:33730 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727383AbgCXRmG (ORCPT ); Tue, 24 Mar 2020 13:42:06 -0400 Received: by mail-pf1-f194.google.com with SMTP id j1so6965184pfe.0 for ; Tue, 24 Mar 2020 10:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=HQvsNwxzxnaojuxdbx2mdkelhql3N9f429mWyfD3kfk=; b=GJksm+dIOqXM5eXFzqz3cV/vl2mEZfHIiK/PqwWIEYgsP9oFl7+BKZd3q69fGEco8i KXzcnsZOnj53hwEZ4CVDkeKeNdr11Bvyrf2ruZ3ghfxb1lkbF34Te8+uoYF/iKARVSZk 53Hyb16KVJqpQFrkXOEmNl80TA3u8+eKT/tnYstthmmVSDMxlu8iWnztXCzcFXLpynvo Y1vZba79yaPrukpv6R7eC4pQPz/ukm/MwXxrawIKgZ8F28Rd/jhSsj+eSm76goQVtSGR xWABVQfCyvYHfZgJB//dA19rdshcf89CEu5cSJzREj810H6B8VToJZXNBUmjpvRCJhpx 0PNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=HQvsNwxzxnaojuxdbx2mdkelhql3N9f429mWyfD3kfk=; b=Dc7za1zxqKHe1oZuntCn7GWUYIyEjTumNmXnUFeLxjWoS98X8mhdNE2zHq6lBrQLzn pJi3BK1jLmlLya0ztU8sj25h19t34++IOP+AEXYC9pzFzmm4awta4jPUHPJJmBkVgEI8 AobkQpVPVsVWLOb/cGOcrzfgSSPZQWqc1FG9wZ4pVdQRAPrgnW3JZ3p2IMWrPPR2DHNI HdTGk5Rzc42ZrKR2NQCiGnWTFTxo8ZA7vS7i5XCTywV+NKI590e3Jd6IED4At9J834Rb mdkefvf+WEt6ldzu/oOKdRUFyP43nSmUCuMG7PEr4DMpo8JVZyn3IhBfiFHBJpkFT5Ra FlQQ== X-Gm-Message-State: ANhLgQ1MzNXqoGk2Vnaq+uEntA3OFzBiAx/pm+nE5cQgAuzi7h6VV0qH 1VnHUFXQJlcHtwFXTeQPd2UEhdsXtrbsVPXWolCjcw== X-Google-Smtp-Source: ADFU+vuI9Q2NMgKPwV+54NfG9A4c5DDLK/vxfhGRUrBZNWUwML032OwOdrGfJUtd7SxTuglgUf50kwg7PJF4bCs3HaI= X-Received: by 2002:a63:a34d:: with SMTP id v13mr7252015pgn.10.1585071724656; Tue, 24 Mar 2020 10:42:04 -0700 (PDT) MIME-Version: 1.0 References: <20200324104005.11279-1-will@kernel.org> <20200324104005.11279-2-will@kernel.org> In-Reply-To: <20200324104005.11279-2-will@kernel.org> From: Nick Desaulniers Date: Tue, 24 Mar 2020 10:41:52 -0700 Message-ID: Subject: Re: [PATCH 1/4] sparc32: mm: Fix argument checking in __srmmu_get_nocache() To: Will Deacon Cc: LKML , kernel-team , "David S. Miller" , Peter Zijlstra , Matt Fleming , sparclinux@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 24, 2020 at 3:52 AM Will Deacon wrote: > > The 'size' argument to __srmmu_get_nocache() is a number of bytes not > a shift value, so fix up the sanity checking to treat it properly. > > Cc: "David S. Miller" > Cc: Peter Zijlstra > Signed-off-by: Will Deacon > --- > arch/sparc/mm/srmmu.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c > index f56c3c9a9793..a19863cac0c4 100644 > --- a/arch/sparc/mm/srmmu.c > +++ b/arch/sparc/mm/srmmu.c > @@ -175,18 +175,18 @@ pte_t *pte_offset_kernel(pmd_t *dir, unsigned long address) > */ > static void *__srmmu_get_nocache(int size, int align) > { > - int offset; > + int offset, minsz = 1 << SRMMU_NOCACHE_BITMAP_SHIFT; > unsigned long addr; > > - if (size < SRMMU_NOCACHE_BITMAP_SHIFT) { > + if (size < minsz) { > printk(KERN_ERR "Size 0x%x too small for nocache request\n", > size); > - size = SRMMU_NOCACHE_BITMAP_SHIFT; > + size = minsz; > } > - if (size & (SRMMU_NOCACHE_BITMAP_SHIFT - 1)) { > - printk(KERN_ERR "Size 0x%x unaligned int nocache request\n", > + if (size & (minsz - 1)) { > + printk(KERN_ERR "Size 0x%x unaligned in nocache request\n", Was modifying the printk intentional? int vs in ? > size); > - size += SRMMU_NOCACHE_BITMAP_SHIFT - 1; > + size += minsz - 1; > } > BUG_ON(align > SRMMU_NOCACHE_ALIGN_MAX); > > -- > 2.20.1 > -- Thanks, ~Nick Desaulniers