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=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 A4EADC4363A for ; Thu, 29 Oct 2020 02:45:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 615602076A for ; Thu, 29 Oct 2020 02:45:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725881AbgJ1Vd1 (ORCPT ); Wed, 28 Oct 2020 17:33:27 -0400 Received: from smtprelay0203.hostedemail.com ([216.40.44.203]:42118 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726039AbgJ1VdV (ORCPT ); Wed, 28 Oct 2020 17:33:21 -0400 Received: from smtprelay.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by smtpgrave03.hostedemail.com (Postfix) with ESMTP id F0CB7181C9B85 for ; Wed, 28 Oct 2020 17:54:23 +0000 (UTC) Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay02.hostedemail.com (Postfix) with ESMTP id 1E88812E0; Wed, 28 Oct 2020 17:54:23 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: can66_48182ef27286 X-Filterd-Recvd-Size: 2608 Received: from XPS-9350.home (unknown [47.151.133.149]) (Authenticated sender: joe@perches.com) by omf10.hostedemail.com (Postfix) with ESMTPA; Wed, 28 Oct 2020 17:54:20 +0000 (UTC) Message-ID: <4684eb7d2a872b23bd3258153370d4de1691bbe4.camel@perches.com> Subject: Re: [PATCH 3/4] RDMA: manual changes for sysfs_emit and neatening From: Joe Perches To: Jason Gunthorpe Cc: Doug Ledford , Potnuri Bharat Teja , Mike Marciniszyn , Dennis Dalessandro , Yishai Hadas , Leon Romanovsky , Christian Benvenuti , Nelson Escobar , Parvi Kaustubhi , Danil Kipnis , Jack Wang , Bart Van Assche , linux-rdma@vger.kernel.org Date: Wed, 28 Oct 2020 10:54:19 -0700 In-Reply-To: <20201028172530.GA2460290@nvidia.com> References: <20201028172530.GA2460290@nvidia.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.38.1-1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org On Wed, 2020-10-28 at 14:25 -0300, Jason Gunthorpe wrote: > On Wed, Oct 07, 2020 at 07:36:26PM -0700, Joe Perches wrote: > > > @@ -653,10 +651,7 @@ static ssize_t serial_show(struct device *device, > >   rdma_device_to_drv_device(device, struct qib_ibdev, rdi.ibdev); > >   struct qib_devdata *dd = dd_from_dev(dev); > >   > > > > - buf[sizeof(dd->serial)] = '\0'; > > - memcpy(buf, dd->serial, sizeof(dd->serial)); > > - strcat(buf, "\n"); > > - return strlen(buf); > > + return sysfs_emit(buf, "%s\n", dd->serial); > >  } > > This is not the same thing? dd->serial does not look null terminated, > eg it is filled like this: > > memcpy(dd->serial, ifp->if_serial, sizeof(ifp->if_serial)); > > From data read off the flash It seems you are correct. Maybe instead: --- static ssize_t serial_show(struct device *device, struct device_attribute *attr, char *buf) { struct qib_ibdev *dev = rdma_device_to_drv_device(device, struct qib_ibdev, rdi.ibdev); struct qib_devdata *dd = dd_from_dev(dev); const u8 *end = memchr(dd->serial, 0, ARRAY_SIZE(dd->serial)); int size = end ? end - dd->serial : ARRAY_SIZE(dd->serial); return sysfs_emit(buf, "%*s\n", size, dd->serial); } static DEVICE_ATTR_RO(serial);