Browse Source

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Fix $() handling, broken since the beginning at r108014.
  Add an entry to RELNOTES for r355677.
  revert r355609
  loader: cd9660_open() warn: is 'buf' large enough for 'struct iso_primary_descriptor'?
hardened/current/master
HardenedBSD Sync Service 5 months ago
parent
commit
2ef8dcf28f
5 changed files with 34 additions and 9 deletions
  1. +2
    -1
      Makefile.inc1
  2. +22
    -0
      RELNOTES
  3. +3
    -3
      sbin/devd/devd.cc
  4. +4
    -4
      stand/libsa/cd9660.c
  5. +3
    -1
      stand/libsa/cd9660read.c

+ 2
- 1
Makefile.inc1 View File

@@ -458,7 +458,8 @@ SUBDIR+=etc
.endif # !empty(SUBDIR_OVERRIDE)

.if defined(NOCLEAN)
.error NOCLEAN option is deprecated. Use NO_CLEAN instead.
.warning NOCLEAN option is deprecated. Use NO_CLEAN instead.
NO_CLEAN= ${NOCLEAN}
.endif
.if defined(NO_CLEANDIR)
CLEANDIR= clean cleandepend

+ 22
- 0
RELNOTES View File

@@ -10,6 +10,28 @@ newline. Entries should be separated by a newline.

Changes to this file should not be MFCed.

r355677:
Adds support for NFSv4.2 (RFC-7862) and Extended Attributes
(RFC-8276) to the NFS client and server.
NFSv4.2 is comprised of several optional features that can be supported
in addition to NFSv4.1. This patch adds the following optional features:
- posix_fadvise(POSIX_FADV_WILLNEED/POSIX_FADV_DONTNEED)
- posix_fallocate()
- intra server file range copying via the copy_file_range(2) syscall
--> Avoiding data tranfer over the wire to/from the NFS client.
- lseek(SEEK_DATA/SEEK_HOLE)
- Extended attribute syscalls for "user" namespace attributes as defined
by RFC-8276.
For the client, NFSv4.2 is only used if the mount command line option
minorversion=2 is specified.
For the server, two new sysctls called vfs.nfsd.server_min_minorversion4
and vfs.nfsd.server_max_minorversion4 have been added that allow
sysadmins to limit the minor versions of NFSv4 supported by the nfsd
server.
Setting vfs.nfsd.server_max_minorversion4 to 0 or 1 will disable NFSv4.2
on the server.

r354517:
iwm(4) now supports most Intel 9260, 9460 and 9560 Wi-Fi devices.


+ 3
- 3
sbin/devd/devd.cc View File

@@ -681,15 +681,15 @@ config::expand_one(const char *&src, string &dst, bool is_shell)
// This is the escape hatch for passing down shell subcommands
if (*src == '(') {
dst += '$';
count = 1;
count = 0;
/* If the string ends before ) is matched , return. */
while (count > 0 && *src) {
do {
if (*src == ')')
count--;
else if (*src == '(')
count++;
dst += *src++;
}
} while (count > 0 && *src);
return;
}


+ 4
- 4
stand/libsa/cd9660.c View File

@@ -286,7 +286,7 @@ cd9660_open(const char *path, struct open_file *f)
struct file *fp = NULL;
void *buf;
struct iso_primary_descriptor *vd;
size_t buf_size, read, dsize, off;
size_t read, dsize, off;
daddr_t bno, boff;
struct iso_directory_record rec;
struct iso_directory_record *dp = NULL;
@@ -294,7 +294,8 @@ cd9660_open(const char *path, struct open_file *f)
bool isdir = false;

/* First find the volume descriptor */
buf = malloc(buf_size = ISO_DEFAULT_BLOCK_SIZE);
buf = malloc(MAX(ISO_DEFAULT_BLOCK_SIZE,
sizeof(struct iso_primary_descriptor)));
vd = buf;
for (bno = 16;; bno++) {
twiddle(1);
@@ -438,8 +439,7 @@ cd9660_open(const char *path, struct open_file *f)
return 0;

out:
if (fp)
free(fp);
free(fp);
free(buf);

return rc;

+ 3
- 1
stand/libsa/cd9660read.c View File

@@ -35,6 +35,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");

#include <sys/param.h>
#include <fs/cd9660/iso.h>
#include <fs/cd9660/cd9660_rrip.h>

@@ -220,7 +221,8 @@ dirmatch(const char *path, struct iso_directory_record *dp, int use_rrip,
static uint64_t
cd9660_lookup(const char *path)
{
static char blkbuf[ISO_DEFAULT_BLOCK_SIZE];
static char blkbuf[MAX(ISO_DEFAULT_BLOCK_SIZE,
sizeof(struct iso_primary_descriptor))];
struct iso_primary_descriptor *vd;
struct iso_directory_record rec;
struct iso_directory_record *dp = NULL;

Loading…
Cancel
Save