From nobody Fri Sep 30 20:45:03 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 4MfMg35BzFz4YN5R; Fri, 30 Sep 2022 20:45:03 +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 4MfMg34dhBz3Xsy; Fri, 30 Sep 2022 20:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664570703; 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=9hDaTokMgPKHqpyBoxO/97PlxRaU1/cyeEelpNhFeco=; b=cqgnq2hZ/LMK69VdnZSUuR8gEz0daNJ6FbmPbNuxxKE9BLh1FK2mSV7aOvE5fcK/Esvonk Vou5q0HOOdAa63PeBI9vHwafKwEAk2K3DO/82KL0eGsOKMXg/A3E5eAwAI0mFRLk1c9WQH Ub5tkUuwkD4kt8RMkJm21GTuKrErrUkW+SaiaRpLtfct/y2DxtQUTFjkFZeruVAxdvs4aY +FUoHJxGV8LuNbXgloYEWCDYGJrS/pKcP9PUnGkxAC5zydfxZ3dascGaT7WugFtRuOdVbJ XkAwnJ+8FL5fYXR+6iJniPdwpORqMt/kF9+r3yIiFTROttbbpunIGjTcxmGaeA== 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 4MfMg33gJ3zJHM; Fri, 30 Sep 2022 20:45:03 +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 28UKj3Kk093494; Fri, 30 Sep 2022 20:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28UKj3iw093493; Fri, 30 Sep 2022 20:45:03 GMT (envelope-from git) Date: Fri, 30 Sep 2022 20:45:03 GMT Message-Id: <202209302045.28UKj3iw093493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 636420bde362 - main - unix/dgram: don't leak file descriptors when socket write failed 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 636420bde36282c4d9c8855e56fdc3601e192129 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664570703; 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=9hDaTokMgPKHqpyBoxO/97PlxRaU1/cyeEelpNhFeco=; b=N+za7ik8OQ2yBf/ALy8uFb34IbrU2AtiYEXBdXoLmvxBWRm2BW0oBci977am+8l/mrW+6i Kp1tq1T34bhnD1DfWeMZtfEvauh7D9y5pLkWmraw/Eu/60d90d6CUHNqSNPIAFImXKTgNf 7k/HGy14VD9tLa9CSx2BURU+m5HWa9nu6FLgFcVJV7wFKHCMRogbgTo1it41/yMnSx6GSC UwQQXKKLar+jN3qqZjXlYzzVxvZ+JH3IUQzDmVABbujR/QnodEpMilva44vJxmI2YJPeCu gv5ogWicee7Eka3XdUp1TVot7CVPqP35ctg6xOWcL3IuNaHXSqLmEqI05eV6hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664570703; a=rsa-sha256; cv=none; b=lzAIwq5g88s+ppNOONK1TNQc1vDDYHQTTT1ueKZX1ZJ5epBIqSRadKJ7NBU4QEeoNRDIeZ DAKhPiYP3w6s9LjcUwYXhlBdelWaCwypFgbwb4BEx9JtfqYmv+tpi8IXxdOJ9kdzzaMFc3 56gFByaVomv6b83a7M1y+9z2gHiXsE+mh7zjw6G+HNaHotWORxtlfKdGEFIBMrObXnlS89 R9ny32seCRIFUCDODiwdJVL+5ISP9XX5O4hsLNsxQfdJrlDyP6JI8KbMVzqpRjwKEKN8eG H2WLMDt8K5dv/QHzojIw1FCrT/ZRe8OvKlEPq+SJuT8xZke3EQB89snbAmA0ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=636420bde36282c4d9c8855e56fdc3601e192129 commit 636420bde36282c4d9c8855e56fdc3601e192129 Author: Gleb Smirnoff AuthorDate: 2022-09-30 20:26:14 +0000 Commit: Gleb Smirnoff CommitDate: 2022-09-30 20:43:08 +0000 unix/dgram: don't leak file descriptors when socket write failed --- sys/kern/uipc_usrreq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 00d7aa1fc968..0c6d41ddca10 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1338,6 +1338,8 @@ uipc_sosend_dgram(struct socket *so, struct sockaddr *addr, struct uio *uio, } else { soroverflow_locked(so2); error = (so->so_state & SS_NBIO) ? EAGAIN : ENOBUFS; + if (f->m_next->m_type == MT_CONTROL) + unp_scan(f->m_next, unp_freerights); } if (addr != NULL)