From nobody Fri Jun 17 19:41:13 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B68D585DA36; Fri, 17 Jun 2022 19:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPqCs3kZ8z3j89; Fri, 17 Jun 2022 19:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S9FjDPtqDtAfdH9BFOqAyHW+bMp6PJ9F0ObnNo8Z9h4=; b=tDKIFthtGuA8/4CYGnogOt6KodbunJaarz+wdZmqmXrfB3njH6pg27qhCc8TrpQUAcAbew H0lt4tsJ8v5OoLa9gGyb0hhbaa3brMYUNJZh57vWrTO5j2mptRg+UXj6e3r35zLNlYJoI8 PhPSB5JeUm3IOK2dyO/LUqkKLaj41jAATpTQ/LwLHnv7elImrEy7tsc+/tCEZ95qrbWfUV KWHAbYiJ+yu/HmLFVBI2THXe0czreY18sv+Q3rRVTAhZ/RAwnyQV7cdMAnXByEkqs0beR0 dRmzJY9nNrFf9206a6aFqb1WU9XZKJBwMA1KXfB/O0mAxifQhBWNdkLtOA2h/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A0F5259DF; Fri, 17 Jun 2022 19:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJfD8D030185; Fri, 17 Jun 2022 19:41:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJfDTn030184; Fri, 17 Jun 2022 19:41:13 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:41:13 GMT Message-Id: <202206171941.25HJfDTn030184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 4c5b420b6582 - stable/13 - linux(4): For future use replace malloc type for l_sockaddr by M_LINUX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4c5b420b6582835dd75fb01945d33307404a9d8d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S9FjDPtqDtAfdH9BFOqAyHW+bMp6PJ9F0ObnNo8Z9h4=; b=CfBS2PL9tws44au7ffI+408kroRyP04t4Aer6p+7B1ZyYBCnO261pHNePTvr+/a4jWYR5z 1ITEgPPKubR2B+nlCY5vSktACjx0eOLongzCTVdTonHYNIe0H7Fdngw0xoyU9q+9qQKqdN yHXCo1gDm5kBwyIyO9RsiApe5eBP/fKXJs6jW7q6Fc4thOuoFxvZUZiUrhn5bw18oT/XBR w4mkedooE6MoHVJrDaZ1sH/hEAojFCFO0YOVPMEwh32AsE6NV5b9Plj4SvvXNfEgELHDxq vAZkZU5Q7kQRB1Cr1GLA3PDDSFkS3kQ64+ABqiRSabKrYUJcvdaD6Y0ewdNJtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494874; a=rsa-sha256; cv=none; b=BwANDd4l+1LTJN5oy14wFewD2RUo9KQUYReKjDSxJRcmCcMyFpfeYLoXNFYZr4OIK8HtFX VTz2QN05wsgIWy/+RmpEvIBbxZ7GvqJixRFNsQbK9aGU5JFz7v4HflGW0YtBcPDJKRTfNb jmGCF4YkSzTtvX0/yXopHwbCa2kf2cKCpWTXB0M2xoOkqcFZb3tkJd5lDcoKqsRnX6/jc2 s/sJrH4uMMebNGxqBDkE5VllsAAMV39S0eWFbli8gdAJ8aq9IqrwPj2oVE2ZPbJbH25mY0 U7IdU0trZGozoKmLrAzPE1IvU97DddG/lgzoHdFLWf5+SVI/ajTQeUvc6o1oDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4c5b420b6582835dd75fb01945d33307404a9d8d commit 4c5b420b6582835dd75fb01945d33307404a9d8d Author: Dmitry Chagin AuthorDate: 2022-05-28 20:44:48 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:34 +0000 linux(4): For future use replace malloc type for l_sockaddr by M_LINUX MFC after: 2 weeks (cherry picked from commit 6335583990d8691ab01cd4fa92390f82f07e3d75) --- sys/compat/linux/linux.c | 2 +- sys/compat/linux/linux_socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 414edc2446bd..7d16edf88b67 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -409,7 +409,7 @@ bsd_to_linux_sockaddr(const struct sockaddr *sa, struct l_sockaddr **lsa, if (bdom == -1) return (EAFNOSUPPORT); - kosa = malloc(len, M_SONAME, M_WAITOK); + kosa = malloc(len, M_LINUX, M_WAITOK); bcopy(sa, kosa, len); kosa->sa_family = bdom; *lsa = kosa; diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 4dee89d1ebd6..56355f4f6ddb 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -731,7 +731,7 @@ linux_copyout_sockaddr(const struct sockaddr *sa, void *uaddr, size_t len) return (error); error = copyout(lsa, uaddr, len); - free(lsa, M_SONAME); + free(lsa, M_LINUX); return (error); }