svn commit: r288142 - stable/10/sys/cam/scsi
Author: mav
Date: Wed Sep 23 05:14:48 2015
New Revision: 288142
URL: https://svnweb.freebsd.org/changeset/base/288142
Log:
MFC r287866: Fix fixed sense writing when passed more data then it can fit.
Modified:
stable/10/sys/cam/scsi/scsi_all.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/scsi/scsi_all.c
==
--- stable/10/sys/cam/scsi/scsi_all.c Wed Sep 23 05:13:49 2015
(r288141)
+++ stable/10/sys/cam/scsi/scsi_all.c Wed Sep 23 05:14:48 2015
(r288142)
@@ -3803,8 +3803,6 @@ scsi_set_sense_data_va(struct scsi_sense
*/
sense->extra_len = 10;
sense_len = (int)va_arg(ap, int);
- len_to_copy = MIN(sense_len, SSD_EXTRA_MAX -
- sense->extra_len);
data = (uint8_t *)va_arg(ap, uint8_t *);
switch (elem_type) {
@@ -3822,10 +3820,14 @@ scsi_set_sense_data_va(struct scsi_sense
uint8_t *data_dest;
int i;
- if (elem_type == SSD_ELEM_COMMAND)
+ if (elem_type == SSD_ELEM_COMMAND) {
data_dest = &sense->cmd_spec_info[0];
- else {
+ len_to_copy = MIN(sense_len,
+ sizeof(sense->cmd_spec_info));
+ } else {
data_dest = &sense->info[0];
+ len_to_copy = MIN(sense_len,
+ sizeof(sense->info));
/*
* We're setting the info field, so
* set the valid bit.
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
Re: svn commit: r287984 - stable/10/sys/contrib/ipfilter/netinet
In message <20150919065128.ga74...@freebsd.org>, Alexey Dokuchaev writes: > On Sat, Sep 19, 2015 at 03:58:32AM +, Cy Schubert wrote: > > New Revision: 287984 > > URL: https://svnweb.freebsd.org/changeset/base/287984 > > > > Log: > > MFC r287651, r287652, r287653. > > > > Fix mutex errors, fixup typos in comments. > > > > Obtained from:NetBSD r1.4. > > -This lie, anr those below, will be ignored-- > > [ template remants trimmed ] > > Every time I see this happen I wonder shall we forbid to execute "svn ci" > other than with -F or -m ? My apologies. After I pasted my commit message and deleted unnecessary lines I obviously missed something. Not good. -- Cheers, Cy Schubert or FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288139 - stable/10/usr.bin/w
Author: delphij
Date: Wed Sep 23 01:07:45 2015
New Revision: 288139
URL: https://svnweb.freebsd.org/changeset/base/288139
Log:
MFC r287590:
w(1) is not setgid binary since r53279, so remove the setgid() call.
Reviewed By: wollman
Modified:
stable/10/usr.bin/w/Makefile
stable/10/usr.bin/w/w.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/w/Makefile
==
--- stable/10/usr.bin/w/MakefileWed Sep 23 00:32:38 2015
(r288138)
+++ stable/10/usr.bin/w/MakefileWed Sep 23 01:07:45 2015
(r288139)
@@ -6,8 +6,6 @@ SRCS= fmt.c pr_time.c proc_compare.c w.c
MAN= w.1 uptime.1
DPADD= ${LIBKVM} ${LIBUTIL}
LDADD= -lkvm -lutil
-#BINGRP= kmem
-#BINMODE=2555
LINKS= ${BINDIR}/w ${BINDIR}/uptime
.PATH: ${.CURDIR}/../../bin/ps
Modified: stable/10/usr.bin/w/w.c
==
--- stable/10/usr.bin/w/w.c Wed Sep 23 00:32:38 2015(r288138)
+++ stable/10/usr.bin/w/w.c Wed Sep 23 01:07:45 2015(r288139)
@@ -132,7 +132,7 @@ main(int argc, char *argv[])
struct kinfo_proc *dkp;
struct stat *stp;
time_t touched;
- int ch, i, nentries, nusers, wcmd, longidle, longattime, dropgid;
+ int ch, i, nentries, nusers, wcmd, longidle, longattime;
const char *memf, *nlistf, *p;
char *x_suffix;
char buf[MAXHOSTNAMELEN], errbuf[_POSIX2_LINE_MAX];
@@ -152,7 +152,6 @@ main(int argc, char *argv[])
p = "dhiflM:N:nsuw";
}
- dropgid = 0;
memf = _PATH_DEVNULL;
nlistf = NULL;
while ((ch = getopt(argc, argv, p)) != -1)
@@ -169,11 +168,9 @@ main(int argc, char *argv[])
case 'M':
header = 0;
memf = optarg;
- dropgid = 1;
break;
case 'N':
nlistf = optarg;
- dropgid = 1;
break;
case 'n':
nflag = 1;
@@ -193,13 +190,6 @@ main(int argc, char *argv[])
_res.retrans = 2; /* resolver timeout to 2 seconds per try */
_res.retry = 1; /* only try once.. */
- /*
-* Discard setgid privileges if not the running kernel so that bad
-* guys can't print interesting stuff from kernel memory.
-*/
- if (dropgid)
- setgid(getgid());
-
if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf)) == NULL)
errx(1, "%s", errbuf);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288136 - in stable: 10/lib/libz 9/lib/libz
Author: dim
Date: Tue Sep 22 22:35:42 2015
New Revision: 288136
URL: https://svnweb.freebsd.org/changeset/base/288136
Log:
MFC r287541:
In libz's inflateMark(), avoid left-shifting a negative integer, which
is undefined.
Reviewed by: delphij
Differential Revision: https://reviews.freebsd.org/D3344
Modified:
stable/10/lib/libz/inflate.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/9/lib/libz/inflate.c
Directory Properties:
stable/9/ (props changed)
stable/9/lib/ (props changed)
stable/9/lib/libz/ (props changed)
Modified: stable/10/lib/libz/inflate.c
==
--- stable/10/lib/libz/inflate.cTue Sep 22 22:27:45 2015
(r288135)
+++ stable/10/lib/libz/inflate.cTue Sep 22 22:35:42 2015
(r288136)
@@ -1504,7 +1504,7 @@ z_streamp strm;
{
struct inflate_state FAR *state;
-if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+if (strm == Z_NULL || strm->state == Z_NULL) return -(1L << 16);
state = (struct inflate_state FAR *)strm->state;
return ((long)(state->back) << 16) +
(state->mode == COPY ? state->length :
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288135 - in stable: 10/sys/dev/bxe 9/sys/dev/bxe
Author: dim
Date: Tue Sep 22 22:27:45 2015
New Revision: 288135
URL: https://svnweb.freebsd.org/changeset/base/288135
Log:
MFC r286733:
Avoid left-shifting negative signed values in bxe(4).
Reviewed by: davidcs
Modified:
stable/10/sys/dev/bxe/ecore_hsi.h
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/9/sys/dev/bxe/ecore_hsi.h
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/10/sys/dev/bxe/ecore_hsi.h
==
--- stable/10/sys/dev/bxe/ecore_hsi.h Tue Sep 22 22:18:36 2015
(r288134)
+++ stable/10/sys/dev/bxe/ecore_hsi.h Tue Sep 22 22:27:45 2015
(r288135)
@@ -2536,9 +2536,9 @@ struct shmem2_region {
#define SHMEM_EEE_SUPPORTED_MASK 0x000f
#define SHMEM_EEE_SUPPORTED_SHIFT 16
#define SHMEM_EEE_ADV_STATUS_MASK 0x00f0
- #define SHMEM_EEE_100M_ADV (1<<0)
- #define SHMEM_EEE_1G_ADV (1<<1)
- #define SHMEM_EEE_10G_ADV (1<<2)
+ #define SHMEM_EEE_100M_ADV (1U<<0)
+ #define SHMEM_EEE_1G_ADV (1U<<1)
+ #define SHMEM_EEE_10G_ADV (1U<<2)
#define SHMEM_EEE_ADV_STATUS_SHIFT 20
#define SHMEM_EEE_LP_ADV_STATUS_MASK 0x0f00
#define SHMEM_EEE_LP_ADV_STATUS_SHIFT 24
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288134 - in stable: 10/sbin/ipfw 9/sbin/ipfw
Author: dim
Date: Tue Sep 22 22:18:36 2015
New Revision: 288134
URL: https://svnweb.freebsd.org/changeset/base/288134
Log:
MFC r286702:
In ipfw2, avoid left-shifting negative integers, which is undefined.
While here, make some other arguments to htonl(3) unsigned too.
Modified:
stable/10/sbin/ipfw/ipfw2.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/9/sbin/ipfw/ipfw2.c
Directory Properties:
stable/9/ (props changed)
stable/9/sbin/ (props changed)
stable/9/sbin/ipfw/ (props changed)
Modified: stable/10/sbin/ipfw/ipfw2.c
==
--- stable/10/sbin/ipfw/ipfw2.c Tue Sep 22 22:07:42 2015(r288133)
+++ stable/10/sbin/ipfw/ipfw2.c Tue Sep 22 22:18:36 2015(r288134)
@@ -2268,14 +2268,14 @@ fill_ip(ipfw_insn_ip *cmd, char *av, int
case '/':
masklen = atoi(p);
if (masklen == 0)
- d[1] = htonl(0);/* mask */
+ d[1] = htonl(0U); /* mask */
else if (masklen > 32)
errx(EX_DATAERR, "bad width ``%s''", p);
else
- d[1] = htonl(~0 << (32 - masklen));
+ d[1] = htonl(~0U << (32 - masklen));
break;
case '{': /* no mask, assume /24 and put back the '{' */
- d[1] = htonl(~0 << (32 - 24));
+ d[1] = htonl(~0U << (32 - 24));
*(--p) = md;
break;
@@ -2284,7 +2284,7 @@ fill_ip(ipfw_insn_ip *cmd, char *av, int
/* FALLTHROUGH */
case 0: /* initialization value */
default:
- d[1] = htonl(~0); /* force /32 */
+ d[1] = htonl(~0U); /* force /32 */
break;
}
d[0] &= d[1]; /* mask base address with mask */
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288133 - in stable: 10/contrib/gcclibs/libcpp 9/contrib/gcclibs/libcpp
Author: dim
Date: Tue Sep 22 22:07:42 2015
New Revision: 288133
URL: https://svnweb.freebsd.org/changeset/base/288133
Log:
MFC r286699:
In gcc's libcpp, stop using the INTTYPE_MAXIMUM() macro, which relies on
undefined behavior. The code used this macro to avoid problems on some
broken systems which define SSIZE_MAX incorrectly, but this is not
needed on FreeBSD, obviously.
Modified:
stable/10/contrib/gcclibs/libcpp/files.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/9/contrib/gcclibs/libcpp/files.c
Directory Properties:
stable/9/ (props changed)
stable/9/contrib/ (props changed)
stable/9/contrib/gcclibs/ (props changed)
Modified: stable/10/contrib/gcclibs/libcpp/files.c
==
--- stable/10/contrib/gcclibs/libcpp/files.cTue Sep 22 21:43:08 2015
(r288132)
+++ stable/10/contrib/gcclibs/libcpp/files.cTue Sep 22 22:07:42 2015
(r288133)
@@ -567,7 +567,7 @@ read_file_guts (cpp_reader *pfile, _cpp_
SSIZE_MAX to be much smaller than the actual range of the
type. Use INTTYPE_MAXIMUM unconditionally to ensure this
does not bite us. */
- if (file->st.st_size > INTTYPE_MAXIMUM (ssize_t))
+ if (file->st.st_size > SSIZE_MAX)
{
cpp_error (pfile, CPP_DL_ERROR, "%s is too large", file->path);
return false;
@@ -581,7 +581,7 @@ read_file_guts (cpp_reader *pfile, _cpp_
file->path);
return false;
}
- else if (offset > INTTYPE_MAXIMUM (ssize_t) || (ssize_t)offset > size)
+ else if (offset > SSIZE_MAX || (ssize_t)offset > size)
{
cpp_error (pfile, CPP_DL_ERROR, "current position of %s is too large",
file->path);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
Re: svn commit: r288079 - in stable/10/sys: kern sys
On Mon, Sep 21, 2015 at 11:55 PM, Oliver Pinter wrote: > On 9/22/15, Oliver Pinter wrote: >> Seems like this commit breaks the build: >> >> --- vfs_hash.o --- >> /jenkins/workspace/HardenedBSD-10-STABLE-amd64/sys/kern/vfs_hash.c:184:2: >> error: implicit declaration of function 'rw_wlock' is invalid in C99 >> [-Werror,-Wimplicit-function-declaration] >> rw_wlock(&vfs_hash_lock); >> ^ >> ... > > The following commit is missing from MFC: > > commit 09f7a46ec71137e29d82d2f0811a7f81b6142266 > Author: mjg > Date: Tue Dec 30 21:40:45 2014 + > > Convert vfs hash lock from a mutex to an rwlock. That's FreeBSD r276424, FWIW. Best, Conrad ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288109 - stable/10/sys/netinet6
Author: garga (ports committer) Date: Tue Sep 22 14:33:43 2015 New Revision: 288109 URL: https://svnweb.freebsd.org/changeset/base/288109 Log: Remove extra space introduced in r287734. This is a stable/10 only fix since original commit (r287094) is correct. Approved by: loos Sponsored by: Rubicon Communications (Netgate) Modified: stable/10/sys/netinet6/in6.c Modified: stable/10/sys/netinet6/in6.c == --- stable/10/sys/netinet6/in6.cTue Sep 22 12:56:34 2015 (r288108) +++ stable/10/sys/netinet6/in6.cTue Sep 22 14:33:43 2015 (r288109) @@ -2388,7 +2388,7 @@ in6if_do_dad(struct ifnet *ifp) * However, some interfaces can be up before the RUNNING * status. Additionaly, users may try to assign addresses * before the interface becomes up (or running). -* This function returns EAGAIN in that case. +* This function returns EAGAIN in that case. * The caller should mark "tentative" on the address instead of * performing DAD immediately. */ ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288107 - stable/10/etc/defaults
Author: jlh
Date: Tue Sep 22 11:38:58 2015
New Revision: 288107
URL: https://svnweb.freebsd.org/changeset/base/288107
Log:
Long overdue MFC r285444:
Allow again periodic scripts to be run from command-line.
PR: 188109
Submitted by: Jason Unovitch
Modified:
stable/10/etc/defaults/periodic.conf
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/defaults/periodic.conf
==
--- stable/10/etc/defaults/periodic.confTue Sep 22 11:25:37 2015
(r288106)
+++ stable/10/etc/defaults/periodic.confTue Sep 22 11:38:58 2015
(r288107)
@@ -365,8 +365,12 @@ if [ -z "${source_periodic_confs_defined
*) return 0 ;;
esac
;;
+'')
+# Script run manually.
+return 0
+;;
*)
- echo "ASSERTION FAILED: Unexpected value for " \
+ echo "ASSERTION FAILED: Unexpected value for" \
"\$PERIODIC: '$PERIODIC'" >&2
exit 127
;;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288106 - stable/10/sys/kern
Author: jlh
Date: Tue Sep 22 11:25:37 2015
New Revision: 288106
URL: https://svnweb.freebsd.org/changeset/base/288106
Log:
Long overdue MFC r284378:
nit: Rename racct_alloc_resource to racct_adjust_resource.
This is more accurate as the amount can be negative.
Modified:
stable/10/sys/kern/kern_racct.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_racct.c
==
--- stable/10/sys/kern/kern_racct.c Tue Sep 22 10:48:28 2015
(r288105)
+++ stable/10/sys/kern/kern_racct.c Tue Sep 22 11:25:37 2015
(r288106)
@@ -502,7 +502,7 @@ racct_destroy(struct racct **racct)
* may be less than zero.
*/
static void
-racct_alloc_resource(struct racct *racct, int resource,
+racct_adjust_resource(struct racct *racct, int resource,
uint64_t amount)
{
@@ -555,7 +555,7 @@ racct_add_locked(struct proc *p, int res
return (error);
}
#endif
- racct_alloc_resource(p->p_racct, resource, amount);
+ racct_adjust_resource(p->p_racct, resource, amount);
racct_add_cred_locked(p->p_ucred, resource, amount);
return (0);
@@ -589,11 +589,11 @@ racct_add_cred_locked(struct ucred *cred
SDT_PROBE(racct, kernel, rusage, add__cred, cred, resource, amount,
0, 0);
- racct_alloc_resource(cred->cr_ruidinfo->ui_racct, resource, amount);
+ racct_adjust_resource(cred->cr_ruidinfo->ui_racct, resource, amount);
for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
- racct_alloc_resource(pr->pr_prison_racct->prr_racct, resource,
+ racct_adjust_resource(pr->pr_prison_racct->prr_racct, resource,
amount);
- racct_alloc_resource(cred->cr_loginclass->lc_racct, resource, amount);
+ racct_adjust_resource(cred->cr_loginclass->lc_racct, resource, amount);
}
/*
@@ -633,7 +633,7 @@ racct_add_force(struct proc *p, int reso
PROC_LOCK_ASSERT(p, MA_OWNED);
mtx_lock(&racct_lock);
- racct_alloc_resource(p->p_racct, resource, amount);
+ racct_adjust_resource(p->p_racct, resource, amount);
mtx_unlock(&racct_lock);
racct_add_cred(p->p_ucred, resource, amount);
}
@@ -687,7 +687,7 @@ racct_set_locked(struct proc *p, int res
}
}
#endif
- racct_alloc_resource(p->p_racct, resource, diff_proc);
+ racct_adjust_resource(p->p_racct, resource, diff_proc);
if (diff_cred > 0)
racct_add_cred_locked(p->p_ucred, resource, diff_cred);
else if (diff_cred < 0)
@@ -749,7 +749,7 @@ racct_set_force_locked(struct proc *p, i
} else
diff_cred = diff_proc;
- racct_alloc_resource(p->p_racct, resource, diff_proc);
+ racct_adjust_resource(p->p_racct, resource, diff_proc);
if (diff_cred > 0)
racct_add_cred_locked(p->p_ucred, resource, diff_cred);
else if (diff_cred < 0)
@@ -851,7 +851,7 @@ racct_sub(struct proc *p, int resource,
"than allocated %jd for %s (pid %d)", __func__, amount, resource,
(intmax_t)p->p_racct->r_resources[resource], p->p_comm, p->p_pid));
- racct_alloc_resource(p->p_racct, resource, -amount);
+ racct_adjust_resource(p->p_racct, resource, -amount);
racct_sub_cred_locked(p->p_ucred, resource, amount);
mtx_unlock(&racct_lock);
}
@@ -872,11 +872,11 @@ racct_sub_cred_locked(struct ucred *cred
resource));
#endif
- racct_alloc_resource(cred->cr_ruidinfo->ui_racct, resource, -amount);
+ racct_adjust_resource(cred->cr_ruidinfo->ui_racct, resource, -amount);
for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
- racct_alloc_resource(pr->pr_prison_racct->prr_racct, resource,
+ racct_adjust_resource(pr->pr_prison_racct->prr_racct, resource,
-amount);
- racct_alloc_resource(cred->cr_loginclass->lc_racct, resource, -amount);
+ racct_adjust_resource(cred->cr_loginclass->lc_racct, resource, -amount);
}
/*
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288105 - stable/10/lib/libc/sys
Author: jlh
Date: Tue Sep 22 10:48:28 2015
New Revision: 288105
URL: https://svnweb.freebsd.org/changeset/base/288105
Log:
Long overdue MFC r284377:
NetBSD commit log:
Use a constant array for the MIB. Newer LLVM decided that mib[] warranted
stack protections, with the obvious crash after the setup was done.
As a positive side effect, code size shrinks a bit.
I'm not sure why this hasn't bitten us yes, but it is certainly possible and
there are no real drawbacks to this change anyway.
Submitted by: pfg
Obtained from:NetBSD
Modified:
stable/10/lib/libc/sys/stack_protector.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libc/sys/stack_protector.c
==
--- stable/10/lib/libc/sys/stack_protector.cTue Sep 22 10:45:50 2015
(r288104)
+++ stable/10/lib/libc/sys/stack_protector.cTue Sep 22 10:48:28 2015
(r288105)
@@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
#include
#include "libc_private.h"
-extern int __sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
-void *newp, size_t newlen);
+extern int __sysctl(const int *name, u_int namelen, void *oldp,
+size_t *oldlenp, void *newp, size_t newlen);
long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0};
static void __guard_setup(void) __attribute__((__constructor__, __used__));
@@ -54,7 +54,7 @@ void __chk_fail(void);
static void
__guard_setup(void)
{
- int mib[2];
+ static const int mib[2] = { CTL_KERN, KERN_ARND };
size_t len;
int error;
@@ -65,12 +65,9 @@ __guard_setup(void)
if (error == 0 && __stack_chk_guard[0] != 0)
return;
- mib[0] = CTL_KERN;
- mib[1] = KERN_ARND;
-
len = sizeof(__stack_chk_guard);
- if (__sysctl(mib, 2, __stack_chk_guard, &len, NULL, 0) == -1 ||
- len != sizeof(__stack_chk_guard)) {
+ if (__sysctl(mib, nitems(mib), __stack_chk_guard, &len, NULL, 0) ==
+ -1 || len != sizeof(__stack_chk_guard)) {
/* If sysctl was unsuccessful, use the "terminator canary". */
((unsigned char *)(void *)__stack_chk_guard)[0] = 0;
((unsigned char *)(void *)__stack_chk_guard)[1] = 0;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288103 - stable/10/sys/kern
Author: kib Date: Tue Sep 22 10:31:48 2015 New Revision: 288103 URL: https://svnweb.freebsd.org/changeset/base/288103 Log: The stable/10 branch uses mutex for vfs_hash. Fix build. Submitted by: Jukka Ukkonen Modified: stable/10/sys/kern/vfs_hash.c Modified: stable/10/sys/kern/vfs_hash.c == --- stable/10/sys/kern/vfs_hash.c Tue Sep 22 10:00:32 2015 (r288102) +++ stable/10/sys/kern/vfs_hash.c Tue Sep 22 10:31:48 2015 (r288103) @@ -181,7 +181,7 @@ vfs_hash_changesize(int newmaxvnodes) * None of the vnodes in the table can be recycled because to * do so, they have to be removed from the hash table. */ - rw_wlock(&vfs_hash_lock); + mtx_lock(&vfs_hash_mtx); vfs_hash_oldtbl = vfs_hash_tbl; vfs_hash_oldmask = vfs_hash_mask; vfs_hash_tbl = vfs_hash_newtbl; @@ -194,6 +194,6 @@ vfs_hash_changesize(int newmaxvnodes) vp, v_hashlist); } } - rw_wunlock(&vfs_hash_lock); + mtx_unlock(&vfs_hash_mtx); free(vfs_hash_oldtbl, M_VFS_HASH); } ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288101 - in stable/10/sys/dev/usb: . serial
Author: garga (ports committer) Date: Tue Sep 22 09:57:35 2015 New Revision: 288101 URL: https://svnweb.freebsd.org/changeset/base/288101 Log: MFC r287828: Add support for Sierra MC7355 card Submitted by: Jeremy Porter Approved by: loos Obtained from:pfSense Sponsored by: Rubicon Communications (Netgate) Modified: stable/10/sys/dev/usb/serial/u3g.c stable/10/sys/dev/usb/usbdevs Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/usb/serial/u3g.c == --- stable/10/sys/dev/usb/serial/u3g.c Tue Sep 22 09:50:11 2015 (r288100) +++ stable/10/sys/dev/usb/serial/u3g.c Tue Sep 22 09:57:35 2015 (r288101) @@ -522,6 +522,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(SIERRA, MC5727_2, 0), U3G_DEV(SIERRA, MC5728, 0), U3G_DEV(SIERRA, MC7354, 0), + U3G_DEV(SIERRA, MC7355, 0), U3G_DEV(SIERRA, MC8700, 0), U3G_DEV(SIERRA, MC8755, 0), U3G_DEV(SIERRA, MC8755_2, 0), Modified: stable/10/sys/dev/usb/usbdevs == --- stable/10/sys/dev/usb/usbdevs Tue Sep 22 09:50:11 2015 (r288100) +++ stable/10/sys/dev/usb/usbdevs Tue Sep 22 09:57:35 2015 (r288101) @@ -4010,6 +4010,7 @@ product SIERRA E6892 0x6892 E6892 product SIERRA E6893 0x6893 E6893 product SIERRA MC8700 0x68A3 MC8700 product SIERRA MC7354 0x68C0 MC7354 +product SIERRA MC7355 0x9041 MC7355 product SIERRA AC313U 0x68aa Sierra Wireless AirCard 313U product SIERRA TRUINSTALL 0x0fff Aircard Tru Installer ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
