Browse Source

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

* freebsd/current/master:
  fsck_ffs/fsdb: fix -fno-common build
  Fix build with src on a noexec filesystem.
  locate: fix -fno-common build
  openssh: -fno-common fix from upstream f47d72ddad
  Add a missing suffix that was causing a whole word to get loaded instead of the proper 8 or 16 bits when the macro was expanded for those sizes.
  Be a bit more precisly in the description of the sysctl variable net.inet.tcp.pmtud_blackhole_detection. Also remove three entries, which are not sysctl variables but statistic counters for TCP. Thanks to 0mp@ for suggesting an improvement.
hardened/current/tmpfs_extattr
HardenedBSD Sync Service 2 months ago
parent
commit
20a497dc46
11 changed files with 22 additions and 21 deletions
  1. +1
    -1
      crypto/openssh/session.c
  2. +4
    -4
      sbin/fsck_ffs/fsck.h
  3. +0
    -1
      sbin/fsck_ffs/gjournal.c
  4. +4
    -0
      sbin/fsck_ffs/globs.c
  5. +2
    -0
      sbin/fsck_ffs/setup.c
  6. +0
    -3
      sbin/fsdb/fsdb.c
  7. +7
    -9
      share/man/man4/tcp.4
  8. +1
    -1
      sys/arm/include/atomic-v6.h
  9. +1
    -1
      usr.bin/kyua/Makefile
  10. +1
    -0
      usr.bin/locate/locate/locate.c
  11. +1
    -1
      usr.bin/locate/locate/locate.h

+ 1
- 1
crypto/openssh/session.c View File

@@ -143,7 +143,7 @@ extern int startup_pipe;
extern void destroy_sensitive_data(void);
extern struct sshbuf *loginmsg;
extern struct sshauthopt *auth_opts;
char *tun_fwd_ifnames; /* serverloop.c */
extern char *tun_fwd_ifnames; /* serverloop.c */

/* original command from peer. */
const char *original_command = NULL;

+ 4
- 4
sbin/fsck_ffs/fsck.h View File

@@ -127,7 +127,7 @@ struct inostat {
* Inode state information is contained on per cylinder group lists
* which are described by the following structure.
*/
struct inostatlist {
extern struct inostatlist {
long il_numalloced; /* number of inodes allocated in this cg */
struct inostat *il_stat;/* inostat info for this cylinder group */
} *inostathead;
@@ -271,13 +271,13 @@ struct dups {
struct dups *next;
ufs2_daddr_t dup;
};
struct dups *duplist; /* head of dup list */
struct dups *muldup; /* end of unique duplicate dup block numbers */
extern struct dups *duplist; /* head of dup list */
extern struct dups *muldup; /* end of unique duplicate dup block numbers */

/*
* Inode cache data structures.
*/
struct inoinfo {
extern struct inoinfo {
struct inoinfo *i_nexthash; /* next entry in hash chain */
ino_t i_number; /* inode number of this entry */
ino_t i_parent; /* inode number of parent */

+ 0
- 1
sbin/fsck_ffs/gjournal.c View File

@@ -93,7 +93,6 @@ static LIST_HEAD(, cgchain) cglist = LIST_HEAD_INITIALIZER(cglist);
static const char *devnam;
static struct uufsd *diskp = NULL;
static struct fs *fs = NULL;
struct ufs2_dinode ufs2_zino;

static void putcgs(void);


+ 4
- 0
sbin/fsck_ffs/globs.c View File

@@ -117,6 +117,10 @@ volatile sig_atomic_t got_sigalarm; /* received a SIGALRM */
struct ufs1_dinode ufs1_zino;
struct ufs2_dinode ufs2_zino;

struct dups *duplist;
struct dups *muldup;
struct inostatlist *inostathead;

void
fsckinit(void)
{

+ 2
- 0
sbin/fsck_ffs/setup.c View File

@@ -58,6 +58,8 @@ __FBSDID("$FreeBSD$");

#include "fsck.h"

struct inoinfo **inphead, **inpsort;

struct uufsd disk;
struct bufarea asblk;
#define altsblock (*asblk.b_un.b_fs)

+ 0
- 3
sbin/fsdb/fsdb.c View File

@@ -70,9 +70,6 @@ usage(void)
exit(1);
}

int returntosingle;
char nflag;

/*
* We suck in lots of fsck code, and just pick & choose the stuff we want.
*

+ 7
- 9
share/man/man4/tcp.4 View File

@@ -34,7 +34,7 @@
.\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93
.\" $FreeBSD$
.\"
.Dd December 2, 2019
.Dd March 29, 2020
.Dt TCP 4
.Os
.Sh NAME
@@ -632,7 +632,12 @@ Turn on automatic path MTU blackhole detection.
In case of retransmits OS will
lower the MSS to check if it's MTU problem.
If current MSS is greater than
configured value to try, it will be set to configured value, otherwise,
configured value to try
.Po Va net.inet.tcp.pmtud_blackhole_mss
and
.Va net.inet.tcp.v6pmtud_blackhole_mss
.Pc ,
it will be set to this value, otherwise,
MSS will be set to default values
.Po Va net.inet.tcp.mssdflt
and
@@ -642,13 +647,6 @@ and
MSS to try for IPv4 if PMTU blackhole detection is turned on.
.It Va v6pmtud_blackhole_mss
MSS to try for IPv6 if PMTU blackhole detection is turned on.
.It Va pmtud_blackhole_activated
Number of times configured values were used in an attempt to downshift.
.It Va pmtud_blackhole_activated_min_mss
Number of times default MSS was used in an attempt to downshift.
.It Va pmtud_blackhole_failed
Number of connections for which retransmits continued even after MSS
downshift.
.It Va functions_available
List of available TCP function blocks (TCP stacks).
.It Va functions_default

+ 1
- 1
sys/arm/include/atomic-v6.h View File

@@ -196,7 +196,7 @@ ATOMIC_ACQ_REL_LONG(clear)
\
__asm __volatile( \
"1: ldrex" SUF " %[tmp], [%[ptr]] \n" \
" ldr %[ret], [%[oldv]] \n" \
" ldr" SUF " %[ret], [%[oldv]] \n" \
" teq %[tmp], %[ret] \n" \
" ittee ne \n" \
" str" SUF "ne %[tmp], [%[oldv]] \n" \

+ 1
- 1
usr.bin/kyua/Makefile View File

@@ -52,7 +52,7 @@ CLEANFILES+= ${MAN}
.PATH: ${KYUA_SRCDIR}/doc
.for man in ${MAN}
${man}: ${man}.in
${SH} ${KYUA_SRCDIR}/doc/manbuild.sh \
sh ${KYUA_SRCDIR}/doc/manbuild.sh \
-v "CONFDIR=${KYUA_CONFDIR}" \
-v "DOCDIR=${KYUA_DOCDIR}" \
-v "EGDIR=${KYUA_EGDIR}" \

+ 1
- 0
usr.bin/locate/locate/locate.c View File

@@ -116,6 +116,7 @@ int f_limit; /* limit number of output lines, 0 == infinite */
u_int counter; /* counter for matches [-c] */
char separator='\n'; /* line separator */

u_char myctype[UCHAR_MAX + 1];

void usage(void);
void statistic(FILE *, char *);

+ 1
- 1
usr.bin/locate/locate/locate.h View File

@@ -65,7 +65,7 @@
define TOLOWER(ch) tolower(ch)
#else

u_char myctype[UCHAR_MAX + 1];
extern u_char myctype[UCHAR_MAX + 1];
#define TOLOWER(ch) (myctype[ch])
#endif


Loading…
Cancel
Save