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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 C9EE5C433E0 for ; Tue, 2 Mar 2021 07:44:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8BE2164DE4 for ; Tue, 2 Mar 2021 07:44:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347451AbhCBESa (ORCPT ); Mon, 1 Mar 2021 23:18:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346445AbhCAXrw (ORCPT ); Mon, 1 Mar 2021 18:47:52 -0500 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9543AC061756 for ; Mon, 1 Mar 2021 15:47:12 -0800 (PST) Received: by mail-pj1-x1036.google.com with SMTP id o6so665621pjf.5 for ; Mon, 01 Mar 2021 15:47:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=hOQErYBU0Jmcx6o4VWiTnlJfnMT/JJge44014ba2W/0=; b=PvDM4zpGo+maq3h18zbqqSLr4xfAHbrF2Y4A8p3mm843j9+T6FQYsPTKKsGBLI7MnE Co6cVVTonKIE8uQRpG5dX35uHM2V1meu0KbFCWLG06Ujwv0UpDTwzTepYtOmN3vad2Zm bkccmXI1xvxTCWkbTycKNmqRVHSs1+h6qdJy4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=hOQErYBU0Jmcx6o4VWiTnlJfnMT/JJge44014ba2W/0=; b=J14QK8QLzyALM+IHjKhTW4d/AJO9u9shBu68re1fGApZKFWb2doYEVoFgN/1bZoCS0 CmEHYWUVNcKSgeTE5ti2hNY0BRmBl79vYKDeFo8ZXiNaqeZco7VS1ukVeqW1GgEZDxlf hHOCiQQvF1b2KD1FiyniSNZlgGdC70WPyNY03cVHKPtsmmQabzwYD47fQjz6OCU7l39B dEQ7yHn6DoJIL0oGkT9Q98SZfWSLkT8c6dH2lU/a8njdq/P0kMb6lbNP6/YvrJqxT/j2 1LNBHfVBxm0bv9DIw3h5E3XoYv9t15N2I/aMZ5H0HuussbPbsdoASriZz+BCsd+xjxEI O/1w== X-Gm-Message-State: AOAM533AEnN5eCCFE9EeW5Iog4eOGpI8TG/VmUuoZpACaDoMCLoO8YUJ 8cqu39kI/JxSg5yFLtAFAD8x4A== X-Google-Smtp-Source: ABdhPJwTbQ9pc38LCgPpVbkkulTN41F1Od+84KaTOP1mJpwQL15bFyw9h0q5Y3c/7j7HRiU4Mh/ynA== X-Received: by 2002:a17:902:b70d:b029:e3:6c97:d180 with SMTP id d13-20020a170902b70db02900e36c97d180mr17932232pls.40.1614642432145; Mon, 01 Mar 2021 15:47:12 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id a136sm18685061pfa.66.2021.03.01.15.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 15:47:11 -0800 (PST) Date: Mon, 1 Mar 2021 15:47:09 -0800 From: Kees Cook To: Masahiro Yamada Cc: Luis Chamberlain , Iurii Zaikin , Alexey Dobriyan , Linux FS-devel Mailing List , Linux Kernel Mailing List , Andrew Morton Subject: Re: [PATCH] sysctl: use min() helper for namecmp() Message-ID: <202103011546.9AA6D832@keescook> References: <20210104083221.21184-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Feb 28, 2021 at 04:44:22PM +0900, Masahiro Yamada wrote: > (CC: Andrew Morton) > > A friendly reminder. > > > This is just a minor clean-up. > > If nobody picks it up, > I hope perhaps Andrew Morton will do. > > This patch: > https://lore.kernel.org/patchwork/patch/1360092/ > > > > > > On Mon, Jan 4, 2021 at 5:33 PM Masahiro Yamada wrote: > > > > Make it slightly readable by using min(). > > > > Signed-off-by: Masahiro Yamada Acked-by: Kees Cook Feel free to take this via your tree Masahiro. Thanks! -Kees > > --- > > > > fs/proc/proc_sysctl.c | 7 +------ > > 1 file changed, 1 insertion(+), 6 deletions(-) > > > > diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c > > index 317899222d7f..86341c0f0c40 100644 > > --- a/fs/proc/proc_sysctl.c > > +++ b/fs/proc/proc_sysctl.c > > @@ -94,14 +94,9 @@ static void sysctl_print_dir(struct ctl_dir *dir) > > > > static int namecmp(const char *name1, int len1, const char *name2, int len2) > > { > > - int minlen; > > int cmp; > > > > - minlen = len1; > > - if (minlen > len2) > > - minlen = len2; > > - > > - cmp = memcmp(name1, name2, minlen); > > + cmp = memcmp(name1, name2, min(len1, len2)); > > if (cmp == 0) > > cmp = len1 - len2; > > return cmp; > > -- > > 2.27.0 > > > > > -- > Best Regards > Masahiro Yamada -- Kees Cook Reviewed-by: Kees Cook -- Kees Cook