From nobody Sat May 28 20:53:22 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 146F71B47EB1; Sat, 28 May 2022 20:53:24 +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 4L9YmM0tY7z4lNg; Sat, 28 May 2022 20:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653771203; 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=x0UmIHWrauUY2zddPiGzi8DfJ7sMwlNUbLAEvf8jOkI=; b=xl18m9FxbmQI5VxLmK56iXoeoWaRXjr6OO2pJ4CJjHV7pvI/a+TO5OKOtyL7vpp+2Dun3B RaOgpTIuvJqbmtYTOndU4eIA2rslVZedu7hIvoLuCufEW0fkuuZaIaUiHgdxgZAXH6x02m nqkydx3cIXGbDnUTBPiawUqNULX6/l2NR27XEB2g5AvmPrxRc2ikMxi1ATa2Rsm7GEVhiu f+KyE+mtI+WceqaO6f9UaMUrJz60mjlutRgD2u87dOuhasX+9x2YgiS9kP32JtjgznHXTv FWxQuruD2UK6vQN4PBFNSfoHqJ619phWh2PoV+MI+G2kRKq2MNF+HNu8Hvluyg== 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 EAE8B15C67; Sat, 28 May 2022 20:53:22 +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 24SKrMMD099385; Sat, 28 May 2022 20:53:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24SKrMjI099384; Sat, 28 May 2022 20:53:22 GMT (envelope-from git) Date: Sat, 28 May 2022 20:53:22 GMT Message-Id: <202205282053.24SKrMjI099384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 6335583990d8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 6335583990d8691ab01cd4fa92390f82f07e3d75 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653771203; 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=x0UmIHWrauUY2zddPiGzi8DfJ7sMwlNUbLAEvf8jOkI=; b=Ns6Mp3uHnhLOrkfw+tUL2POAmUvPwuotKuh6v0AvPsaoCEP02b3VBLRrZHK3yUnoCXwOqU J7pVpARQhbYGq3AGia2wQWUrhQB/2zlsB+BCbTbjv3ANJeKaEsXMElxvm3HtRFV9vjEfmX 0KUjk05A7U5eJaqr39/xjePn/VzKoHmvlG9MdFOoc4ZwhAyTUslgIYsQNDuEFTmknqNjA5 Hjfhffs5mZXyQi2TWv8t7io5Hxsbf+z8DcXXsYvMho0J34U4dTUh2lFbSbdrCy4N45Ur9r XJssWe/oUN/AMpyszf5MxnmJAkmYZel6AOUtMypqzU8JBQ9TYaOIR00L+PuQ1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653771203; a=rsa-sha256; cv=none; b=N6SlUmum5Ez+d4Hq7vSNkR4aLLufKEp3vR6uzwhyG1rPKBdILQSZOssHDUcG7psL6Te8qO /6mrwDl4vRl71+gCbBoOXtAyX968V+ysxLxUzSUuGUjMfr2xjhqQGEoYdg7LxEvb7uAH/1 EEAhUlAmFVvp+iBHr3G53TtWTMkeSngmowLQoPxX1WM9F84FwAKcd0MFEc4QZ+UDKnqYCs SrUzpPFQw67S2k5wAWMU9mgVZhhYdRcLb4AQwjtvoAuZclHsjt5f6rA2/7wMjtMOzEGQd8 hH/pOiX8Z4At0jXA65uF6Cas+u42hZVRwewpV3M3Tn+IGk5ivtYl9CXIEL/GoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6335583990d8691ab01cd4fa92390f82f07e3d75 commit 6335583990d8691ab01cd4fa92390f82f07e3d75 Author: Dmitry Chagin AuthorDate: 2022-05-28 20:44:48 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-28 20:44:48 +0000 linux(4): For future use replace malloc type for l_sockaddr by M_LINUX MFC after: 2 weeks --- 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 2de5d9ca1911..f29fc2b6743a 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); }