From owner-svn-src-head@freebsd.org Sat Mar 28 22:16:07 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F00C42686F1 for ; Sat, 28 Mar 2020 22:16:07 +0000 (UTC) (envelope-from tsoome@me.com) Received: from st43p00im-ztfb10063301.me.com (st43p00im-ztfb10063301.me.com [17.58.63.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 48qY2h5mQxz4MTl for ; Sat, 28 Mar 2020 22:15:56 +0000 (UTC) (envelope-from tsoome@me.com) Received: from nazgul.lan (148-52-235-80.sta.estpak.ee [80.235.52.148]) by st43p00im-ztfb10063301.me.com (Postfix) with ESMTPSA id 7E08DA403AC; Sat, 28 Mar 2020 22:15:46 +0000 (UTC) From: Toomas Soome Message-Id: <12C6C7A4-F1F8-469A-860A-9DD064DE8240@me.com> Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Re: svn commit: r359408 - head/stand/libsa/zfs Date: Sun, 29 Mar 2020 00:15:44 +0200 In-Reply-To: Cc: Toomas Soome , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" To: Oliver Pinter References: <202003282150.02SLoRao067734@repo.freebsd.org> X-Mailer: Apple Mail (2.3608.80.23.2.2) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2020-03-28_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-2003280209 X-Rspamd-Queue-Id: 48qY2h5mQxz4MTl X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.10 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[me.com]; R_SPF_ALLOW(-0.20)[+ip4:17.58.0.0/16:c]; MV_CASE(0.50)[]; RCPT_COUNT_FIVE(0.00)[5]; DKIM_TRACE(0.00)[me.com:+]; DMARC_POLICY_ALLOW(-0.50)[me.com,quarantine]; FREEMAIL_TO(0.00)[gmail.com]; RCVD_IN_DNSWL_LOW(-0.10)[179.63.58.17.list.dnswl.org : 127.0.5.1]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[me.com]; ASN(0.00)[asn:714, ipnet:17.58.63.0/24, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[148.52.235.80.khpj7ygk5idzvmvt5x4ziurxhy.zen.dq.spamhaus.net : 127.0.0.10]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[me.com:s=1a1hai]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; IP_SCORE_FREEMAIL(0.00)[]; DWL_DNSWL_LOW(-1.00)[me.com.dwl.dnswl.org : 127.0.5.1]; TO_MATCH_ENVRCPT_SOME(0.00)[]; IP_SCORE(0.00)[ip: (-5.13), ipnet: 17.58.63.0/24(-1.62), asn: 714(-2.42), country: US(-0.05)]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; SUSPICIOUS_RECIPS(1.50)[] Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 22:16:08 -0000 > On 29. Mar 2020, at 00:04, Oliver Pinter = wrote: >=20 >=20 >=20 > On Saturday, March 28, 2020, Toomas Soome > wrote: > Author: tsoome > Date: Sat Mar 28 21:50:27 2020 > New Revision: 359408 > URL: https://svnweb.freebsd.org/changeset/base/359408 = >=20 > Log: > loader: strdup name strings from dataset walker >=20 > The removal of zfs scratch buffer did miss the fact the dataset > lookup was picking up the names from zap list. >=20 > Modified: > head/stand/libsa/zfs/zfs.c >=20 > Modified: head/stand/libsa/zfs/zfs.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/stand/libsa/zfs/zfs.c Sat Mar 28 21:47:44 2020 = (r359407) > +++ head/stand/libsa/zfs/zfs.c Sat Mar 28 21:50:27 2020 = (r359408) > @@ -92,7 +92,7 @@ static int zfs_env_count; > SLIST_HEAD(zfs_be_list, zfs_be_entry) zfs_be_head =3D = SLIST_HEAD_INITIALIZER(zfs_be_head); > struct zfs_be_list *zfs_be_headp; > struct zfs_be_entry { > - const char *name; > + cha *name; >=20 > I think this will be "char *".=20 Yes, I guess I must have (accidentally) removed the =E2=80=98r' after = the build. The fix is already posted. rgds, toomas > =20 > SLIST_ENTRY(zfs_be_entry) entries; > } *zfs_be, *zfs_be_tmp; >=20 > @@ -906,6 +906,7 @@ zfs_bootenv_initial(const char *name) > while (!SLIST_EMPTY(&zfs_be_head)) { > zfs_be =3D SLIST_FIRST(&zfs_be_head); > SLIST_REMOVE_HEAD(&zfs_be_head, entries); > + free(zfs_be->name); > free(zfs_be); > } >=20 > @@ -973,6 +974,7 @@ zfs_bootenv(const char *name) > while (!SLIST_EMPTY(&zfs_be_head)) { > zfs_be =3D SLIST_FIRST(&zfs_be_head); > SLIST_REMOVE_HEAD(&zfs_be_head, entries); > + free(zfs_be->name); > free(zfs_be); > } >=20 > @@ -992,7 +994,11 @@ zfs_belist_add(const char *name, uint64_t value = __unus > if (zfs_be =3D=3D NULL) { > return (ENOMEM); > } > - zfs_be->name =3D name; > + zfs_be->name =3D strdup(name); > + if (zfs_be->name =3D=3D NULL) { > + free(zfs_be); > + return (ENOMEM); > + } > SLIST_INSERT_HEAD(&zfs_be_head, zfs_be, entries); > zfs_env_count++; >=20 > _______________________________________________ > svn-src-head@freebsd.org mailing = list > https://lists.freebsd.org/mailman/listinfo/svn-src-head = > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org = "