sendfile tests: Fix an error check in tcp_socketpair()
ClosedPublic
Actions

Authored by markj on Jun 14 2024, 5:42 PM.

Details

Reviewers

chs
glebius

Commits

rGac52fa1f1b97: sendfile tests: Fix an error check in tcp_socketpair()

Summary

Fixes: c368d3f20fc0 ("tests/sendfile: factor out tcp_socketpair()")

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 58177
Build 55065: arc lint + arc unit

Event Timeline

markj created this revision.Jun 14 2024, 5:42 PM

Herald added a subscriber: imp. · View Herald TranscriptJun 14 2024, 5:42 PM

markj requested review of this revision.Jun 14 2024, 5:42 PM

Harbormaster completed remote builds in B58177: Diff 139854.Jun 14 2024, 5:42 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jun 21 2024, 6:22 PM

Closed by commit rGac52fa1f1b97: sendfile tests: Fix an error check in tcp_socketpair() (authored by markj). · Explain Why

This revision was automatically updated to reflect the committed changes.

markj added a commit: rGac52fa1f1b97: sendfile tests: Fix an error check in tcp_socketpair().

Revision Contents
Changeset List

Path

Size

tests/

sys/

kern/

sendfile_helper.c

2 lines

Diff 139854

View Options

tests/sys/kern/sendfile_helper.c

This file was added.

Property	Old Value	New Value
svn:eol-style	null	native \ No newline at end of property
svn:keywords	null	FreeBSD=%H \ No newline at end of property
svn:mime-type	null	text/plain \ No newline at end of property

				/*-
				* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
				*
				* Copyright (c) 2019 John Baldwin <jhb@FreeBSD.org>
				*
				* This software was developed by SRI International and the University of
				* Cambridge Computer Laboratory (Department of Computer Science and
				* Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
				* DARPA SSITH research programme.
				*
				* Redistribution and use in source and binary forms, with or without
				* modification, are permitted provided that the following conditions
				* are met:
				* 1. Redistributions of source code must retain the above copyright
				* notice, this list of conditions and the following disclaimer.
				* 2. Redistributions in binary form must reproduce the above copyright
				* notice, this list of conditions and the following disclaimer in the
				* documentation and/or other materials provided with the distribution.
				*
				* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
				* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
				* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
				* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
				* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
				* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
				* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
				* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
				* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
				* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
				* SUCH DAMAGE.
				*
				* $FreeBSD$
				*/

				#include <sys/types.h>
				#include <machine/elf.h>

				#include <err.h>
				#include <errno.h>

				#include "ef.h"

				/*
				* Apply relocations to the values we got from the file. `relbase' is the
				* target relocation address of the section, and `dataoff' is the target
				* relocation address of the data in `dest'.
				*/
				int
				ef_reloc(struct elf_file ef, const void reldata, int reltype, Elf_Off relbase,
				Elf_Off dataoff, size_t len, void *dest)
				{
				Elf_Addr *where, val;
				const Elf_Rel *rel;
				const Elf_Rela *rela;
				Elf_Addr addend, addr;
				Elf_Size rtype, symidx;

				switch (reltype) {
				case EF_RELOC_REL:
				rel = (const Elf_Rel *)reldata;
				where = (Elf_Addr )((char )dest + relbase + rel->r_offset -
				dataoff);
				addend = 0;
				rtype = ELF_R_TYPE(rel->r_info);
				symidx = ELF_R_SYM(rel->r_info);
				break;
				case EF_RELOC_RELA:
				rela = (const Elf_Rela *)reldata;
				where = (Elf_Addr )((char )dest + relbase + rela->r_offset -
				dataoff);
				addend = rela->r_addend;
				rtype = ELF_R_TYPE(rela->r_info);
				symidx = ELF_R_SYM(rela->r_info);
				break;
				default:
				return (EINVAL);
				}

				impUnsubmitted Not Done Inline Actions Do you need a cast here to where to only write 4 bytes instead of 8? imp: Do you need a cast here to where to only write 4 bytes instead of 8?
				jhbAuthorUnsubmitted Done Inline Actions Hmm, this matches what the kernel code does. I didn't have any relevant R_MIPS_32 relocations in mips64 kernel modules though. Maybe I'll spin up a 32-bit mips qemu instance to see what happens there. It may be that I end up just using an #ifdef on the ABI for R_MIPS_32 vs R_MIPS_64 and the body of the case is the one for R_MIPS_64. jhb: Hmm, this matches what the kernel code does. I didn't have any relevant R_MIPS_32 relocations…
				if ((char )where < (char )dest \|\| (char )where >= (char )dest + len)
				return (0);

				if (reltype == EF_RELOC_REL)
				addend = *where;

				switch (rtype) {
				#ifdef __LP64__
				case R_MIPS_64: /* S + A */
				#else
				case R_MIPS_32: /* S + A */
				#endif
				addr = EF_SYMADDR(ef, symidx);
				val = addr + addend;
				*where = val;
				break;
				default:
				warnx("unhandled relocation type %d", (int)rtype);
				}
				return (0);
				}

sendfile tests: Fix an error check in tcp_socketpair()ClosedPublicActions