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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C792E92FCF for ; Thu, 5 Oct 2023 23:24:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229481AbjJEXYW (ORCPT ); Thu, 5 Oct 2023 19:24:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229703AbjJEXWV (ORCPT ); Thu, 5 Oct 2023 19:22:21 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23280D4D for ; Thu, 5 Oct 2023 16:22:13 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6907e44665bso1343406b3a.1 for ; Thu, 05 Oct 2023 16:22:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696548132; x=1697152932; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=6bji6Y/iqc3Ls4HMnb/SvLNQn11BkVMYtm7umOlKP+Y=; b=LVj33L2UFWQMakAG3Bh/RooDyc4ptKeAgr8LVX6xm06gxXWhqKvr27XMxlnkff1j25 y0zatUiKeEdOeq0EHCNmlEvd+yHB2hv2JBbBKaZFlM2Hx7EHw8pwC7oyySvXHdwYlc2d gD8GmwG2DBQlZXG7nh+3cGTzk1CZpZbtj0JWw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696548132; x=1697152932; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6bji6Y/iqc3Ls4HMnb/SvLNQn11BkVMYtm7umOlKP+Y=; b=kqhP8WDT8jZ6KryH18DxBiSl8+p6C7WcOg1RpJsFCWBZryv+xJTsC47y2/48TZIkgJ VtnyCzdWxrlrrJ1yrLM9BXLI5x1sTd6CP0yWoXfuINCZ16ayA+0vpdDCiqX8Z9G5z7Lm xb4+J7tQfhU7JbQuDgStGQx/AfmmJ/66dE96BXtDPMXsTVZ9cW/iN/d+nFfrIEtC+u7M b8o4uqEZFH5QGZKAPrrxsSZUC0We2vlbIZ3zp6IKFMGdl6xg4wC6016vPxz3C/9/4QOs TaGroGBmE39/6UJ3DnVimFdqtPTLB0+XnXHKbCp1s0/DZj2tSHwy3qID0vfCPy/b77wL fqWA== X-Gm-Message-State: AOJu0YxENcyBwAqN/Jxt0yHBhTJQoTGOLseUXrVtoRvyS5gOrgy25Oil J2R+zlZ+ePupbqMLajNP2kvzzQ== X-Google-Smtp-Source: AGHT+IHcVAOVq3Ibd4ay7/n9G/MxAAd8KXHRxyv+DWM76fM8x8ZKzUr/Kz0H3QBJYudJsStbU5RLpQ== X-Received: by 2002:a05:6a20:1596:b0:137:74f8:62ee with SMTP id h22-20020a056a20159600b0013774f862eemr7879316pzj.18.1696548132606; Thu, 05 Oct 2023 16:22:12 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id m7-20020aa78a07000000b0064fd4a6b306sm129832pfa.76.2023.10.05.16.22.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 16:22:12 -0700 (PDT) Date: Thu, 5 Oct 2023 16:22:10 -0700 From: Kees Cook To: Justin Stitt Cc: Derek Chickles , Satanand Burla , Felix Manlunas , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH] cavium/liquidio: replace deprecated strncpy with strscpy Message-ID: <202310051621.3893B1EA4@keescook> References: <20231005-strncpy-drivers-net-ethernet-cavium-liquidio-octeon_device-c-v1-1-9a207cef9438@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231005-strncpy-drivers-net-ethernet-cavium-liquidio-octeon_device-c-v1-1-9a207cef9438@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 05, 2023 at 10:52:34PM +0000, Justin Stitt wrote: > `strncpy` is deprecated for use on NUL-terminated destination strings > [1] and as such we should prefer more robust and less ambiguous string > interfaces. > > We expect `app_name` to be NUL-terminated: > dev_info(&oct->pci_dev->dev, > "Running %s (%llu Hz)\n", > app_name, CVM_CAST64(cs->corefreq)); > ... and it seems NUL-padding is not required, let's opt for strscpy(). > > For `oct->boardinfo.name/serial_number` let's opt for strscpy() as well > since it is expected to be NUL-terminated and does not require > NUL-padding as `oct` is zero-initialized in octeon_device.c +707: > | buf = vzalloc(size); > | if (!buf) > | return NULL; > | > | oct = (struct octeon_device *)buf; > > Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] > Link: https://github.com/KSPP/linux/issues/90 > Cc: linux-hardening@vger.kernel.org > Signed-off-by: Justin Stitt > --- > Note: build-tested only. > --- > drivers/net/ethernet/cavium/liquidio/octeon_device.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c b/drivers/net/ethernet/cavium/liquidio/octeon_device.c > index 364f4f912dc2..6b6cb73482d7 100644 > --- a/drivers/net/ethernet/cavium/liquidio/octeon_device.c > +++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.c > @@ -1217,10 +1217,10 @@ int octeon_core_drv_init(struct octeon_recv_info *recv_info, void *buf) > goto core_drv_init_err; > } > > - strncpy(app_name, > + strscpy(app_name, > get_oct_app_string( > (u32)recv_pkt->rh.r_core_drv_init.app_mode), > - sizeof(app_name) - 1); > + sizeof(app_name)); Direct replacement, good. > oct->app_mode = (u32)recv_pkt->rh.r_core_drv_init.app_mode; > if (recv_pkt->rh.r_core_drv_init.app_mode == CVM_DRV_NIC_APP) { > oct->fw_info.max_nic_ports = > @@ -1257,9 +1257,10 @@ int octeon_core_drv_init(struct octeon_recv_info *recv_info, void *buf) > memcpy(cs, get_rbd( > recv_pkt->buffer_ptr[0]) + OCT_DROQ_INFO_SIZE, sizeof(*cs)); > > - strncpy(oct->boardinfo.name, cs->boardname, OCT_BOARD_NAME); > - strncpy(oct->boardinfo.serial_number, cs->board_serial_number, > - OCT_SERIAL_LEN); > + strscpy(oct->boardinfo.name, cs->boardname, > + sizeof(oct->boardinfo.name)); > + strscpy(oct->boardinfo.serial_number, cs->board_serial_number, > + sizeof(oct->boardinfo.serial_number)); struct octeon_board_info { char name[OCT_BOARD_NAME]; char serial_number[OCT_SERIAL_LEN]; Good, sizeof()s match. Reviewed-by: Kees Cook -- Kees Cook