From nobody Mon Jun 27 08:15:14 2022 X-Original-To: dev-commits-src-branches@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 724E88726F9; Mon, 27 Jun 2022 08:15: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 4LWgWk2kY4z4cds; Mon, 27 Jun 2022 08:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656317714; 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=rj4Wvk7iDM+1x7UlTscYo11FARsK452lvbkSGUIcw3M=; b=FgVvIwRDW7uBNY7b1ikgKaekvocADCW+GLD/35MNxh38ee4yMpsD/tg2YYNAG1n8ixd8UY SXJ2RLfJAdbYIBvpefVPaSkigbo4x/ghHKVM57q9p2xZz9omTqebQtVXByuK6ovBsZM3xx bHP/lSKz1D30l3ojuV+aQopGFYLEWUBmUoEgGWfbIbmmULfQYUaty4N/e41EADKS9TaqJ2 oaofg5bgo9GPrZq1Q8rthG0PTRTm3rzOg4xsHSHZPzHPMyEa96NnZK4qDQ1o0WjNRi1WfJ Iqa4PWNhz3vrH6jgOn+zvWKgpUKAn+S728TGWxUKjmTAedSBXuYCBXjtuLOGVA== 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 3792A24AA8; Mon, 27 Jun 2022 08:15:14 +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 25R8FEit092887; Mon, 27 Jun 2022 08:15:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25R8FEj8092886; Mon, 27 Jun 2022 08:15:14 GMT (envelope-from git) Date: Mon, 27 Jun 2022 08:15:14 GMT Message-Id: <202206270815.25R8FEj8092886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 1ecd211915ff - stable/13 - ibcore: Fix sysfs registration error flow List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1ecd211915ff0dd1989db9e8052794f1ea872772 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656317714; 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=rj4Wvk7iDM+1x7UlTscYo11FARsK452lvbkSGUIcw3M=; b=rDQhBcBnK5FlC8gKtqezFUV8ACMBbXXC3MIixDWisOELgQPzBbgSCtnw7WvkvM1WPaXhay hoq5d2E/vl4YQzhNkQu8saYpZpgn8fEvEHLpCc3FcCRvT7D9KPgYwn6OCTnJAmknoAF3GW ol087SkQlUU64gSqKiEE+OFP3wUWskh1lYI0HI+DNRvbGVQ1s6nqx38KfAWwXy/kcLE6Eu iwFWV5WO4v0K/wSTfzfk8pi4wYBcYP0zwmjIuys3KDpRJhdjspBd91841dHymVXFRN+eoG hhoA4T4dSVUeW4poK4LqHDX5CJPoEXlpTezDAE2CvlWZvdjU8sCAZkuJQg0uoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656317714; a=rsa-sha256; cv=none; b=PZmxgtaEHD4CoyupMQn0nR8gT05B6o9APGoyAXsB4arFR/rL4ZU5c9Qt2MdJmBrbkZDOAG tBKDiDfkk0GnVEzbiS8w3P4ZhxvHRURKg/GmGJ+1onKpOkLJuN77os+KO28Xnwx/ALqyHu P44JgDrgbBVUfK/pXGI/cGYiSRSRRtaEIEXR/guHcwyNAcyntJDdDrE7rJNgBl5SbKxazo gQctHPEqLTlaEwqdBkgGbbjH8hvLoifO3EmlooHVxteF6irpFtEfEc8E6CzDCPpNlYbpFU Os3D08RqYb+8LMmIuTK3aksho+dOYdelihr2aztBMDzHiVcxA0lkkABqif00dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=1ecd211915ff0dd1989db9e8052794f1ea872772 commit 1ecd211915ff0dd1989db9e8052794f1ea872772 Author: Hans Petter Selasky AuthorDate: 2022-06-21 09:07:06 +0000 Commit: Hans Petter Selasky CommitDate: 2022-06-27 08:14:49 +0000 ibcore: Fix sysfs registration error flow The kernel commit cited below restructured ib device management so that the device kobject is initialized in ib_alloc_device. As part of the restructuring, the kobject is now initialized in procedure ib_alloc_device, and is later added to the device hierarchy in the ib_register_device call stack, in procedure ib_device_register_sysfs (which calls device_add). However, in the ib_device_register_sysfs error flow, if an error occurs following the call to device_add, the cleanup procedure device_unregister is called. This call results in the device object being deleted -- which results in various use-after-free crashes. The correct cleanup call is device_del -- which undoes device_add without deleting the device object. The device object will then (correctly) be deleted in the ib_register_device caller's error cleanup flow, when the caller invokes ib_dealloc_device. Linux commit: b312be3d87e4c80872cbea869e569175c5eb0f9a PR: 264472 Sponsored by: NVIDIA Networking (cherry picked from commit 55d183367104e3efcdaa936f65e4f82303871271) --- sys/ofed/drivers/infiniband/core/ib_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ofed/drivers/infiniband/core/ib_sysfs.c b/sys/ofed/drivers/infiniband/core/ib_sysfs.c index 4cbb69ad899b..63f6c2641b83 100644 --- a/sys/ofed/drivers/infiniband/core/ib_sysfs.c +++ b/sys/ofed/drivers/infiniband/core/ib_sysfs.c @@ -1366,7 +1366,7 @@ err_put: free_port_list_attributes(device); err_unregister: - device_unregister(class_dev); + device_del(class_dev); err: return ret;