From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 01 Nov 2023 08:26:41 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qy5cf-00DIOZ-HJ for lore@lore.pengutronix.de; Wed, 01 Nov 2023 08:26:41 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qy5cZ-0008MN-WA for lore@pengutronix.de; Wed, 01 Nov 2023 08:26:40 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3aDfAl2ic6GsMrUCA4hbyOrBwJyU8iRA2VdV6ni+CoU=; b=easoEPNkX5gwdtRQBsuEPuYV/0 ljgmSiEB2HffBRdIXeK+9ki45uIjM8XYbn4iueJNwdbDivtA3rojd8sO37qOxfQFrV28WfuYSncGX rMVIK7ws+nTydpf4xVCCqAEqSLsIt1MWoCj5tVR2oahO6zq+zprX272vxeRiCebiXKSaRBBFfWeqS hqQo1gtc9SFlhJrzLl9xgrQCruZosMn2/bLJMtJ3mLK2HCrylp3q4v+7OGlPqVbw/4cKmO2OLcF47 PManPxktZ6y+BLEACUfqMa9mFVLZQaQEjiRFkEiwE7rpG7v+8LFuu4GlWRIEhf+I+LJXKoYQnAAkn Vj6oOiwA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qy5ac-006nzC-31; Wed, 01 Nov 2023 07:24:34 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qy5aX-006nyL-1b for barebox@lists.infradead.org; Wed, 01 Nov 2023 07:24:33 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qy5aR-00088s-Tl; Wed, 01 Nov 2023 08:24:23 +0100 Message-ID: Date: Wed, 1 Nov 2023 08:24:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US To: Marco Felsch , Sascha Hauer Cc: barebox@lists.infradead.org References: <20231026144325.4172966-1-m.felsch@pengutronix.de> <20231027080034.GZ3359458@pengutronix.de> <20231027080943.lpdzdpcgi6n6f7mk@pengutronix.de> <20231027081738.GA3359458@pengutronix.de> <20231027081953.mxzja57qjzinicj6@pengutronix.de> From: Ahmad Fatoum In-Reply-To: <20231027081953.mxzja57qjzinicj6@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231101_002429_535625_3EDCCDC9 X-CRM114-Status: GOOD ( 20.17 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-7.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH v2 1/2] usb: gadget: initialize serialnumber X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) On 27.10.23 10:19, Marco Felsch wrote: > On 23-10-27, Sascha Hauer wrote: >> On Fri, Oct 27, 2023 at 10:09:43AM +0200, Marco Felsch wrote: >>> On 23-10-27, Sascha Hauer wrote: >>>> On Thu, Oct 26, 2023 at 11:32:10PM +0200, Ahmad Fatoum wrote: >>>>> On 26.10.23 16:43, Marco Felsch wrote: >>>>>> Windows hosts do require the serial number to be set to any ascii string >>>>>> to enumerate correctly. Set the serial number if provided or to "unset" >>>>>> if not to provide a sane default which works for both hosts. >>>>>> >>>>>> Reported-by: Andrey Zhizhikin >>>>>> Signed-off-by: Marco Felsch >>>>> >>>>> Reviewed-by: Ahmad Fatoum >>>>> >>>>>> --- >>>>>> Changelog >>>>>> >>>>>> v2: >>>>>> - adapt commit message >>>>>> - use barebox_get_serial_number() and "unset" >>>>>> >>>>>> drivers/usb/gadget/udc/core.c | 2 +- >>>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>>> >>>>>> diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c >>>>>> index b58498680ad1..e7cfa0d5d836 100644 >>>>>> --- a/drivers/usb/gadget/udc/core.c >>>>>> +++ b/drivers/usb/gadget/udc/core.c >>>>>> @@ -1204,7 +1204,7 @@ int usb_add_gadget(struct usb_gadget *gadget) >>>>>> gadget->productname = xstrdup(barebox_get_model()); >>>>>> dev_add_param_string(&gadget->dev, "productname", NULL, NULL, >>>>>> &gadget->productname, NULL); >>>>>> - gadget->serialnumber = xstrdup(""); >>>>>> + gadget->serialnumber = xstrdup(barebox_get_serial_number() ? : "unset"); >>>>> >>>>> Nitpick: xstrdup(NULL) == NULL, so the ternary could be moved out the xstrdup. >>>> >>>> gadget->serialnumber is freed when the value of the variable is changed, >>>> so it must be an allocated string. gadget->serialnumber = "unset" would >>>> be wrong. >>> >>> I would have done the following: >>> >>> xstrdup(barebox_get_serial_number()) ? : xstrdup("unset"); >> >> Your original code looked better. This one looks like the ?: handles >> failures in xstrdup(). > > Right, thanks for the input. Agreed with Sascha, I forgot it had to be an allocated string. > > Regards, > Marco > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |