From patchwork Mon Jul 17 10:00:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 121174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1016261vqt; Mon, 17 Jul 2023 03:13:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlFce8Spwn18mouHywdOxwMsOsM/8pir07c8QloVdYjqPVbp+LQzLMPKO8Zx1SmYSbMKc0FE X-Received: by 2002:a05:6a00:228e:b0:668:7292:b2c4 with SMTP id f14-20020a056a00228e00b006687292b2c4mr17194222pfe.4.1689588834277; Mon, 17 Jul 2023 03:13:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689588834; cv=none; d=google.com; s=arc-20160816; b=jLsS8AHDmaNyVcMSD5LwgwNdfbbFDqxfBG5TUpTnJslOI4MvT1x+La2pqEcfQLzPzn ZZXoekQ3yjDqDHL8Xt0bjxImtIk5+GNFWk28M2ye3Q80en1xVlhW2Q7CFUoZDaEvLQTR +XQzBLX9v8h29C6J/dOzk9x3+himHUG3+DeRYuDP72lKp3fSMWIPAvy1Acuijt/vgdnK jHJnTwuIG0E3b9wrIc7iyQRi3tjU8C8XRYRgeDmv/2dnW52804UWqhilFQeGCAj17kb0 lK56XeE/zoaXrd8bBFQ6mmfP1y2gzU2D77+Qi0wW+lN50vSG4OZyWQA0CJhL8hNQws9Q 7hUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=zshKLewW7y6t0Xlhdl6Aubw0HM2vl0HCDVgl2lB3Z+c=; fh=T2n1MCQe89xYZqrZsEyWI/e9cBInj4AC2yu70kG4Q8g=; b=SdcS5QIA+IHnsoFSPC3+vOAPYxUnTZ/AnnGwWWW1buJmSfkhk7J7GXXS878nOvUekp lUmTpvIpkkfYEC0LO3PhbOVzYLCsxDLc6bAeO8C34HBBzS0oPzJUprOh9WCUAR8DlqaX sJBSaF/0LgCgqPdhxEFTgytQJmceW/80vd5tmeW9UOKCzny2jI9xyc0L7lMNbXqGGBIV 81KorzayhEH9uKinLdYbZLN1BXySSaZDlE+RSImrIKLHShv/oP7qkV8u9WDrLNvnLhoo tvAVnruwvpQ3TV5GHYQEahmE0qhhNuC1uTc9IJkkHBq8W5P5i5xeaox9GX9W6yA+zPGC R7VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ec1w6SSp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fi14-20020a056a00398e00b0067f03c85d73si11387892pfb.115.2023.07.17.03.13.41; Mon, 17 Jul 2023 03:13:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ec1w6SSp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230039AbjGQKAN (ORCPT + 99 others); Mon, 17 Jul 2023 06:00:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231301AbjGQKAK (ORCPT ); Mon, 17 Jul 2023 06:00:10 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB28A10D3; Mon, 17 Jul 2023 03:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689588003; x=1721124003; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=0/4YfnWj7uZZvcBnfx2vVS2SmTppJGml5QU6wI2Ls2E=; b=ec1w6SSpDWjz2aQ6KbmuzXoz1RtMxP15rwtZgJ7yJQbQt0h0VaWngsr8 GtiNcHv3a+e01j4jD1N91FWj38kdA1No1zQdTmZ7c7QA6wy3tUc1+YQIp 1aotsNHOHBrTDWMXGIKxCNVaXPhvMgKMxozfQt5gm5KhefWG1ufHJPDGd karlOB+mYgEopeqjmn10kgdM2eEv6jOb1nhLzFXOjr1ak7a4I4TQF9iWf c3FPDo+8mTa8DeV/IJ9dt7p/IV90xVIiIodhrqeosqZI1KqKglbFItNgu Z4B3sC+5hdcujYZI0qvSq3Lwkz6LR+vO1D0JtHV70/nL8/8DFW22EUl2R Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="452264270" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="452264270" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2023 03:00:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="788595459" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="788595459" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 17 Jul 2023 03:00:00 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 82458256; Mon, 17 Jul 2023 13:00:06 +0300 (EEST) From: Andy Shevchenko To: Steve French , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-kernel@vger.kernel.org Cc: Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey , Andy Shevchenko Subject: [PATCH v1 1/1] smb: client: Rework memcpy() to avoid compilation error Date: Mon, 17 Jul 2023 13:00:03 +0300 Message-Id: <20230717100003.11824-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771662301080213003 X-GMAIL-MSGID: 1771662301080213003 In function ‘fortify_memcpy_chk’, inlined from ‘CIFS_open’ at fs/smb/client/cifssmb.c:1249:3: include/linux/fortify-string.h:592:25: error: call to ‘__read_overflow2_field’ declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror=attribute-warning] 592 | __read_overflow2_field(q_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Instead of memcpy() use member-by-member copy. Let compiler do its job on optimisation. Signed-off-by: Andy Shevchenko --- fs/smb/client/cifssmb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c index 9dee267f1893..33ebb63826d3 100644 --- a/fs/smb/client/cifssmb.c +++ b/fs/smb/client/cifssmb.c @@ -1245,8 +1245,11 @@ CIFS_open(const unsigned int xid, struct cifs_open_parms *oparms, int *oplock, *oplock |= CIFS_CREATE_ACTION; if (buf) { - /* copy from CreationTime to Attributes */ - memcpy((char *)buf, (char *)&rsp->CreationTime, 36); + buf->CreationTime = rsp->CreationTime; + buf->LastAccessTime = rsp->LastAccessTime; + buf->LastWriteTime = rsp->LastWriteTime; + buf->ChangeTime = rsp->ChangeTime; + buf->FileAttributes = rsp->FileAttributes; /* the file_info buf is endian converted by caller */ buf->AllocationSize = rsp->AllocationSize; buf->EndOfFile = rsp->EndOfFile;