From nobody Wed Dec 10 21:56:46 2025 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 4dRV1B2gjZz6Jkvt for ; Wed, 10 Dec 2025 21:56:46 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dRV1B22sbz3Ch4 for ; Wed, 10 Dec 2025 21:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765403806; 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=jwORGsPRedMWONDD+H3JsYemDig+kskokGPpN+J7ceM=; b=A8urKs4LyQ6NbQwE1JGWdCHWEPpJzOkBn1OcStzLSr2LaO+d6FCf9s6yGlJ5ZTNUt/0RPY jolfbBu5ISUEKh++ykeGLlFcBanj5zhkWnjAWtnjYi/5B8CGJ0nt21Gisv+bium74ETOid yFbJRWl1mOSYOdUvtwDnI7gH6ZcogyMua2mqVMjNilTWvfP+Gx1wUHBgtClmuMG2QuJDo3 DCaBurMikkheF4BeAlmxSsuVH0KTlvImcUHyZ7dYKgYZrEC/isLGlZoDMXuHok+qBlt2Sh rpF5T52i5ZNU+zTzKPVOJaAf8TV9Txe4PJ5nHmxfVtHG6O3514a2gzvtbw//UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765403806; 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=jwORGsPRedMWONDD+H3JsYemDig+kskokGPpN+J7ceM=; b=w5wnojTWPB9tQs6kOjoKsT9Qur4u2O3z1gwMOOfH0PKCTJKt4teST0sQqGUTqum3R203sc NYUEkJkJZAU3tiMlNQXfMlPu5iafPYYe3wcd1urhyNmAfUewE+T1Km6uKHLJzHhwnU25rM ElKklBTMItJ/b4BoFDkC1EJ6btDWjGkJy0d+NmqXKqfQohQ/6yNJf7Sh9vCqq8tnWO1aU/ p3qfPGWQxjXYixEEj9ncbuizOQvFCcx9VFrYZjmCYjP/ZSt0Yy7pScakMbBfvmALt6UajZ iCb0AieoQ4k3FpRK4uug7ZCxUuppgkQhRlOsyUBQxZtpfC/MPmlPl44uVdRwlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765403806; a=rsa-sha256; cv=none; b=JRik4PzTldTSUL6DxqipaRKVoTDrzjYesAepNGmyyGncJ2TB1vTA6tz5NhoX3APzaBSixP xnbR2dGBLdvllkGcNxxPqNGmCQYINZspGtEKvid8b6c7S+a5VFpY9YcHxK3QFi/z/HzkOM bi4xjVZpZnC5Lm6qjBpj7VDYwL3u04NLyS+aRbuPgK4/2UMeMxoZn0QPMtBRDo24g4CJRj tEAHjdkWaq4gishW+C21y+CbSUqDQWbH2/i91af0UoKJaN5akF2w+kqws5CcGaMuqQCeq7 ZgdOAcPeYORvIcfgyDfOnff8utmI0hB3ySAASq84nF2Ql6PahDvRF5su5g1HKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dRV1B1b0jz12rs for ; Wed, 10 Dec 2025 21:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3550a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 21:56:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a8d8bf4affa9 - main - sendfile: if sendfile_getobj() fails jump to the function epilogue 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a8d8bf4affa95d3939442a65ea5c8f73785903e5 Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 21:56:46 +0000 Message-Id: <6939ec9e.3550a.bd529d5@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a8d8bf4affa95d3939442a65ea5c8f73785903e5 commit a8d8bf4affa95d3939442a65ea5c8f73785903e5 Author: Gleb Smirnoff AuthorDate: 2025-12-10 21:56:14 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-10 21:56:14 +0000 sendfile: if sendfile_getobj() fails jump to the function epilogue The functional change here is that *sent would be zeroed. Note that some portable applications, e.g. OpenSSL, use a wrapper around our sendfile(2) to make it more Linux-like. These wrappers are usually written in a manner that expects *sbytes to always be initialized regardless of the error code returned. --- sys/kern/kern_sendfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index 7ffb09c58b9c..6e924f70b2ab 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -735,7 +735,7 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, error = sendfile_getobj(td, fp, &obj, &vp, &shmfd, &obj_size, &bsize); if (error != 0) - return (error); + goto out; error = sendfile_getsock(td, sockfd, &sock_fp, &so); if (error != 0)