Re: svn commit: r362217 - head/stand/common
On Tue, Jun 16, 2020 at 9:53 PM Warner Losh wrote:
>
>
> On Tue, Jun 16, 2020 at 8:33 PM Ian Lepore wrote:
>
>> On Tue, 2020-06-16 at 19:34 +0200, Kristof Provost wrote:
>> > On 16 Jun 2020, at 19:11, Ed Maste wrote:
>> > > On Tue, 16 Jun 2020 at 13:01, Ian Lepore wrote:
>> > > >
>> > > > As much as I prefer doing it this way, style(9) doesn't allow for
>> > > > variable declarations inside a for() statement (or even inside a
>> > > > local
>> > > > block, which is just too 1980s for me, but it is still our
>> standard).
>> > >
>> > > Perhaps it's time to update style(9) to at least permit these uses, as
>> > > we've done with the blank line at the beginning of functions with no
>> > > local variables, and with braces around single-line bodies.
>> >
>> > We have 431 instances of `for (int i` in sys alone. It’s not so much a
>> > question of allowing it as acknowledging reality at this point.
>> >
>> > Best regards,
>> > Kristof
>>
>> Hmm, so we do. If you weed out sys/contrib, and device drivers
>> contributed by vendors, the number is a lot smaller, but still big
>> enough that we should just change the rules I think.
>>
>
> We should definitely just change the rules. There's no point in
> prohibiting it. Contributors have already voted with their feet
>
> diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
> index 4e801bbcbe70..fd23d573eb00 100644
> --- a/share/man/man9/style.9
> +++ b/share/man/man9/style.9
> @@ -592,8 +592,6 @@ not
> Parts of a
> .Ic for
> loop may be left empty.
> -Do not put declarations
> -inside blocks unless the routine is unusually complicated.
> .Bd -literal
> for (; cnt < 15; cnt++) {
> stmt1;
>
> Though the block doesn't start until { so int i; in the commit technically
> doesn't violate this rule. We violate it in dozens of other ways than this.
>
Re-reading the thread, it seems there's a consensus to change.
https://reviews.freebsd.org/D25312
> Warner
>
>
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r362217 - head/stand/common
On Tue, Jun 16, 2020 at 8:33 PM Ian Lepore wrote:
> On Tue, 2020-06-16 at 19:34 +0200, Kristof Provost wrote:
> > On 16 Jun 2020, at 19:11, Ed Maste wrote:
> > > On Tue, 16 Jun 2020 at 13:01, Ian Lepore wrote:
> > > >
> > > > As much as I prefer doing it this way, style(9) doesn't allow for
> > > > variable declarations inside a for() statement (or even inside a
> > > > local
> > > > block, which is just too 1980s for me, but it is still our standard).
> > >
> > > Perhaps it's time to update style(9) to at least permit these uses, as
> > > we've done with the blank line at the beginning of functions with no
> > > local variables, and with braces around single-line bodies.
> >
> > We have 431 instances of `for (int i` in sys alone. It’s not so much a
> > question of allowing it as acknowledging reality at this point.
> >
> > Best regards,
> > Kristof
>
> Hmm, so we do. If you weed out sys/contrib, and device drivers
> contributed by vendors, the number is a lot smaller, but still big
> enough that we should just change the rules I think.
>
We should definitely just change the rules. There's no point in
prohibiting it. Contributors have already voted with their feet
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index 4e801bbcbe70..fd23d573eb00 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -592,8 +592,6 @@ not
Parts of a
.Ic for
loop may be left empty.
-Do not put declarations
-inside blocks unless the routine is unusually complicated.
.Bd -literal
for (; cnt < 15; cnt++) {
stmt1;
Although the block doesn't start until { so int i; in the commit
technically doesn't violate this rule. We violate it in dozens of other
ways than this.
Warner
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362257 - head/share/man/man4
Author: adrian Date: Wed Jun 17 03:16:20 2020 New Revision: 362257 URL: https://svnweb.freebsd.org/changeset/base/362257 Log: [ath] Mention DWDS, expresscard and minipcie. I use all of these.. Modified: head/share/man/man4/ath.4 Modified: head/share/man/man4/ath.4 == --- head/share/man/man4/ath.4 Wed Jun 17 03:12:43 2020(r362256) +++ head/share/man/man4/ath.4 Wed Jun 17 03:16:20 2020(r362257) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd January 25, 2019 +.Dd June 16, 2020 .Dt ATH 4 .Os .Sh NAME @@ -59,10 +59,10 @@ The driver provides support for wireless network adapters based on the Atheros AR5210, AR5211, AR5212, AR5416 and AR9300 programming APIs. These APIs are used by a wide variety of chips; most all chips with -a PCI and/or CardBus interface are supported. +a PCI, PCIe and/or CardBus interface are supported. .Pp Supported features include 802.11 and 802.3 frames, power management, BSS, -IBSS, MBSS, TDMA, and host-based access point operation modes. +IBSS, MBSS, WDS/DWDS TDMA, and host-based access point operation modes. All host/device interaction is via DMA. .Pp Please note that from FreeBSD-9.0, the @@ -147,12 +147,13 @@ For more information on configuring this device, see .Pp Devices supported by the .Nm -driver come in either Cardbus or mini-PCI packages. -Wireless cards in Cardbus slots may be inserted and ejected on the fly. +driver come in Cardbus, ExpressCard, Mini-PCI and Mini-PCIe packages. +Wireless cards in Cardbus and ExpressCard slots may be inserted and +ejected on the fly. .Sh HARDWARE The .Nm -driver supports all Atheros Cardbus and PCI cards, +driver supports all Atheros Cardbus, ExpressCard, PCI and PCIe cards, except those that are based on the AR5005VL chipset. .Sh EXAMPLES Join a specific BSS network with WEP encryption: @@ -292,8 +293,7 @@ device driver first appeared in Revision A1 of the D-LINK DWL-G520 and DWL-G650 are based on an Intersil PrismGT chip and are not supported by this driver. .Sh BUGS -The driver does not fully enable power-save operation of the chip -in station mode; consequently power use is suboptimal (e.g. on a laptop). +The driver does supports optional station mode power-save operation. .Pp The AR5210 can only do WEP in hardware; consequently hardware assisted WEP is disabled in order to allow software implementations of TKIP and CCMP to ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362256 - head/share/man/man4
Author: adrian Date: Wed Jun 17 03:12:43 2020 New Revision: 362256 URL: https://svnweb.freebsd.org/changeset/base/362256 Log: [run] mention that some 11n functionality is now available. A-MPDU, short-gi and 40MHz mode is currently not supported, but hey, it supports enough 11n to be useful. Modified: head/share/man/man4/run.4 Modified: head/share/man/man4/run.4 == --- head/share/man/man4/run.4 Wed Jun 17 01:11:47 2020(r362255) +++ head/share/man/man4/run.4 Wed Jun 17 03:12:43 2020(r362256) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 8, 2018 +.Dd June 16, 2020 .Dt RUN 4 .Os .Sh NAME @@ -251,5 +251,5 @@ driver was written by .Sh CAVEATS The .Nm -driver does not support any of the 802.11n capabilities offered by the +driver supports some of the 11n capabilities found in the RT2800, RT3000 and RT3900 chipsets. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r362217 - head/stand/common
On Tue, 2020-06-16 at 10:30 -0700, Rodney W. Grimes wrote: > > In message < > > 55903c38d363aef2a6f6d0075dd4526b86d51258.ca...@freebsd.org>, > > Ian Le > > pore writes: > > > On Tue, 2020-06-16 at 07:05 +, Toomas Soome wrote: > > > > Author: tsoome > > > > Date: Tue Jun 16 07:05:03 2020 > > > > New Revision: 362217 > > > > URL: https://svnweb.freebsd.org/changeset/base/362217 > > > > > > > > Log: > > > > loader: variable i is unused without MBR/GPT support built in > > > > > > > > Because i is only used as index in for loop, declare it in > > > > for > > > > statement. > > > > > > > > > > As much as I prefer doing it this way, style(9) doesn't allow for > > > variable declarations inside a for() statement (or even inside a > > > local > > > block, which is just too 1980s for me, but it is still our > > > standard). > > Last time I tried to assert that bit of style(9) with respect to > inside a local block I was over ridden, so it is probably time > to atleast revisit that part of style(9). > > > Doesn't this use stack for a shorter period of time or does the > > compiler > > optimize this, making this change moot? > > > > The tradeoff is a few extra bytes of stack for a longer period of > > time vs a > > few extra instructions incrementing and decrementing the stack > > pointer. > > I do not think the reasoning had to do with stack space vs > instuctions, > but more about being able to clearly know about variable reuse and > not > do it as that can create fun bugs. > > Tools have modernized since that part of style was written. I think a modern compiler will likely emit one of those "declaration of foo here shadows declaration in outer scope" type messages. Not that it should; IMO, part of the point of keeping definitions confined to as local a scope as possible is to help ensure you're using the variable you think you are in that local scope and not accidentally perturbing something used elsewhere. -- Ian ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r362217 - head/stand/common
On Tue, 2020-06-16 at 19:34 +0200, Kristof Provost wrote: > On 16 Jun 2020, at 19:11, Ed Maste wrote: > > On Tue, 16 Jun 2020 at 13:01, Ian Lepore wrote: > > > > > > As much as I prefer doing it this way, style(9) doesn't allow for > > > variable declarations inside a for() statement (or even inside a > > > local > > > block, which is just too 1980s for me, but it is still our standard). > > > > Perhaps it's time to update style(9) to at least permit these uses, as > > we've done with the blank line at the beginning of functions with no > > local variables, and with braces around single-line bodies. > > We have 431 instances of `for (int i` in sys alone. It’s not so much a > question of allowing it as acknowledging reality at this point. > > Best regards, > Kristof Hmm, so we do. If you weed out sys/contrib, and device drivers contributed by vendors, the number is a lot smaller, but still big enough that we should just change the rules I think. -- Ian ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362254 - in vendor/file/dist: . doc magic magic/Magdir src
Author: delphij Date: Wed Jun 17 01:11:26 2020 New Revision: 362254 URL: https://svnweb.freebsd.org/changeset/base/362254 Log: Vendor import of file 5.39. Added: vendor/file/dist/libmagic.pc.in (contents, props changed) vendor/file/dist/magic/Magdir/asf vendor/file/dist/magic/Magdir/dif vendor/file/dist/magic/Magdir/sylk vendor/file/dist/magic/Magdir/unisig vendor/file/dist/magic/Magdir/usd vendor/file/dist/magic/Magdir/web Modified: vendor/file/dist/ChangeLog vendor/file/dist/Makefile.am vendor/file/dist/Makefile.in vendor/file/dist/configure vendor/file/dist/configure.ac vendor/file/dist/doc/file.man vendor/file/dist/doc/magic.man vendor/file/dist/magic/Magdir/animation vendor/file/dist/magic/Magdir/archive vendor/file/dist/magic/Magdir/cad vendor/file/dist/magic/Magdir/commands vendor/file/dist/magic/Magdir/compress vendor/file/dist/magic/Magdir/console vendor/file/dist/magic/Magdir/database vendor/file/dist/magic/Magdir/der vendor/file/dist/magic/Magdir/elf vendor/file/dist/magic/Magdir/filesystems vendor/file/dist/magic/Magdir/games vendor/file/dist/magic/Magdir/gnu vendor/file/dist/magic/Magdir/images vendor/file/dist/magic/Magdir/intel vendor/file/dist/magic/Magdir/kicad vendor/file/dist/magic/Magdir/linux vendor/file/dist/magic/Magdir/msdos vendor/file/dist/magic/Magdir/ole2compounddocs vendor/file/dist/magic/Magdir/parix vendor/file/dist/magic/Magdir/pascal vendor/file/dist/magic/Magdir/pdf vendor/file/dist/magic/Magdir/pgp vendor/file/dist/magic/Magdir/python vendor/file/dist/magic/Magdir/riff vendor/file/dist/magic/Magdir/rst vendor/file/dist/magic/Magdir/rtf vendor/file/dist/magic/Magdir/sgml vendor/file/dist/magic/Magdir/sniffer vendor/file/dist/magic/Magdir/ssh vendor/file/dist/magic/Magdir/ti-8x vendor/file/dist/magic/Magdir/tplink vendor/file/dist/magic/Magdir/troff vendor/file/dist/magic/Magdir/virtual vendor/file/dist/magic/Magdir/windows vendor/file/dist/magic/Magdir/wordprocessors vendor/file/dist/magic/Magdir/zip vendor/file/dist/magic/Makefile.am vendor/file/dist/magic/Makefile.in vendor/file/dist/src/apprentice.c vendor/file/dist/src/ascmagic.c vendor/file/dist/src/buffer.c vendor/file/dist/src/compress.c vendor/file/dist/src/der.c vendor/file/dist/src/file.c vendor/file/dist/src/file.h vendor/file/dist/src/file_opts.h vendor/file/dist/src/funcs.c vendor/file/dist/src/is_json.c vendor/file/dist/src/magic.c vendor/file/dist/src/print.c vendor/file/dist/src/readelf.c vendor/file/dist/src/seccomp.c vendor/file/dist/src/softmagic.c Modified: vendor/file/dist/ChangeLog == --- vendor/file/dist/ChangeLog Tue Jun 16 22:53:56 2020(r362253) +++ vendor/file/dist/ChangeLog Wed Jun 17 01:11:26 2020(r362254) @@ -1,3 +1,83 @@ +2020-06-14 20:02 Christos Zoulas + + * release 5.39 + +2020-06-07 20:00 Christos Zoulas + + * Remove unused subtype_mime (Steve Grubb) + * Remove unused check in okstat (Steve Grubb) + * Fix mime-type in elf binaries by making sure $x is set + * Fix indirect negative offsets broken by OFFNEGATIVE + * Fix GUID equality check + * PR/165: Handle empty array and strings in JSON + * PR/162: Add --exclude-quiet + +2020-06-06 15:33 Christos Zoulas + + * Fix memory leak in ascmagic (Steve Grubb) + +2020-06-04 00:21 Christos Zoulas + + * Fix string comparison length with ignore whitespace + +2020-05-31 00:11 Christos Zoulas + + * Fix mingwin 64 compilation + +2020-05-30 23:56 Christos Zoulas + + * PR/159: whitelist getpid needed for file_pipe2file() + +2020-05-09 18:57 Christos Zoulas + + * Indicate negative offsets with a flag OFFNEGATIVE + so that -0 works. + * Introduce "offset" magic type that can be used to + detect the file size, and bail on short files. + * document DER better in the magic man page. + +2020-03-11 21:53 Christos Zoulas + + * fix memory leaks (SonarQube) + +2020-03-08 21:33 Christos Zoulas + + * fix memory leaks (SonarQube) + * rewrite confusing loops (SonarQube) + * fix bogus test (SonarQube) + * pass a sized buffer to file_fmttime() (SonarQube) + + * fix memory leaks (SonarQube) + +2020-02-20 15:50 Christos Zoulas + + * Don't allow * in printf formats, or the code itself (Christoph Biedl) + * Introduce a printf output size checker to avoid DoS attacks + +2020-02-17 17:22 Christos Zoulas + + * Avoid memory leak on error (oss-fuzz) + * Check length of string on DER before derefercing and add new types + * Add missing DER string (oss-fuzz) + +2020-02-16 20:45 Christos Zoulas + + * Add missing DER types, and debugging + +2020-02-13 13:10 Christos Zoulas + + * PR/140: Avoid abort with hand-crafted magic file
svn commit: r362255 - vendor/file/5.39
Author: delphij Date: Wed Jun 17 01:11:47 2020 New Revision: 362255 URL: https://svnweb.freebsd.org/changeset/base/362255 Log: Tag file 5.39. Added: vendor/file/5.39/ - copied from r362254, vendor/file/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362253 - head/sys/vm
Author: cem
Date: Tue Jun 16 22:53:56 2020
New Revision: 362253
URL: https://svnweb.freebsd.org/changeset/base/362253
Log:
vm: Drop vm_map_clip_{start,end} macro wrappers
No functional change.
Reviewed by: dougm, markj
Sponsored by: Dell EMC Isilon
Differential Revision:https://reviews.freebsd.org/D25282
Modified:
head/sys/vm/vm_map.c
Modified: head/sys/vm/vm_map.c
==
--- head/sys/vm/vm_map.cTue Jun 16 21:30:30 2020(r362252)
+++ head/sys/vm/vm_map.cTue Jun 16 22:53:56 2020(r362253)
@@ -2377,24 +2377,17 @@ vm_map_entry_clone(vm_map_t map, vm_map_entry_t entry)
* the specified address; if necessary,
* it splits the entry into two.
*/
-#define vm_map_clip_start(map, entry, startaddr) \
-{ \
- if (startaddr > entry->start) \
- _vm_map_clip_start(map, entry, startaddr); \
-}
-
-/*
- * This routine is called only when it is known that
- * the entry must be split.
- */
static inline void
-_vm_map_clip_start(vm_map_t map, vm_map_entry_t entry, vm_offset_t start)
+vm_map_clip_start(vm_map_t map, vm_map_entry_t entry, vm_offset_t start)
{
vm_map_entry_t new_entry;
+ if (start <= entry->start)
+ return;
+
VM_MAP_ASSERT_LOCKED(map);
KASSERT(entry->end > start && entry->start < start,
- ("_vm_map_clip_start: invalid clip of entry %p", entry));
+ ("%s: invalid clip of entry %p", __func__, entry));
new_entry = vm_map_entry_clone(map, entry);
@@ -2435,24 +2428,17 @@ vm_map_lookup_clip_start(vm_map_t map, vm_offset_t sta
* the specified address; if necessary,
* it splits the entry into two.
*/
-#define vm_map_clip_end(map, entry, endaddr) \
-{ \
- if ((endaddr) < (entry->end)) \
- _vm_map_clip_end((map), (entry), (endaddr)); \
-}
-
-/*
- * This routine is called only when it is known that
- * the entry must be split.
- */
static inline void
-_vm_map_clip_end(vm_map_t map, vm_map_entry_t entry, vm_offset_t end)
+vm_map_clip_end(vm_map_t map, vm_map_entry_t entry, vm_offset_t end)
{
vm_map_entry_t new_entry;
+ if (end >= entry->end)
+ return;
+
VM_MAP_ASSERT_LOCKED(map);
KASSERT(entry->start < end && entry->end > end,
- ("_vm_map_clip_end: invalid clip of entry %p", entry));
+ ("%s: invalid clip of entry %p", __func__, entry));
new_entry = vm_map_entry_clone(map, entry);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362252 - head/sys/kern
Author: freqlabs
Date: Tue Jun 16 21:30:30 2020
New Revision: 362252
URL: https://svnweb.freebsd.org/changeset/base/362252
Log:
Apply default security flavor in vfs_export
There may be some version of mountd out there that does not supply a default
security flavor when none is given for an export.
Set the default security flavor in vfs_export if none is given, and remove the
workaround for oexport compat.
Reported by: npn
Reviewed by: rmacklem
Approved by: mav (mentor)
MFC after:3 days
Sponsored by: iXsystems, Inc.
Differential Revision:https://reviews.freebsd.org/D25300
Modified:
head/sys/kern/vfs_export.c
head/sys/kern/vfs_mount.c
Modified: head/sys/kern/vfs_export.c
==
--- head/sys/kern/vfs_export.c Tue Jun 16 21:29:02 2020(r362251)
+++ head/sys/kern/vfs_export.c Tue Jun 16 21:30:30 2020(r362252)
@@ -61,6 +61,9 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
+#include
+
static MALLOC_DEFINE(M_NETADDR, "export_host", "Export host address
structure");
#if defined(INET) || defined(INET6)
@@ -303,7 +306,7 @@ vfs_export(struct mount *mp, struct export_args *argp)
return (EINVAL);
if ((argp->ex_flags & MNT_EXPORTED) != 0 &&
- (argp->ex_numsecflavors <= 0
+ (argp->ex_numsecflavors < 0
|| argp->ex_numsecflavors >= MAXSECFLAVORS))
return (EINVAL);
@@ -340,6 +343,10 @@ vfs_export(struct mount *mp, struct export_args *argp)
MNT_ILOCK(mp);
mp->mnt_flag |= MNT_EXPUBLIC;
MNT_IUNLOCK(mp);
+ }
+ if (argp->ex_numsecflavors == 0) {
+ argp->ex_numsecflavors = 1;
+ argp->ex_secflavors[0] = AUTH_SYS;
}
if ((error = vfs_hang_addrlist(mp, nep, argp)))
goto out;
Modified: head/sys/kern/vfs_mount.c
==
--- head/sys/kern/vfs_mount.c Tue Jun 16 21:29:02 2020(r362251)
+++ head/sys/kern/vfs_mount.c Tue Jun 16 21:30:30 2020(r362252)
@@ -70,9 +70,6 @@ __FBSDID("$FreeBSD$");
#include
-#include
-#include
-
#include
#include
@@ -1131,8 +1128,6 @@ vfs_domount_update(
switch (len) {
case (sizeof(struct oexport_args)):
bzero(, sizeof(o2export));
- o2export.ex_numsecflavors = 1;
- o2export.ex_secflavors[0] = AUTH_SYS;
/* FALLTHROUGH */
case (sizeof(o2export)):
bcopy(bufp, , len);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362251 - head/libexec/rtld-elf
Author: kib
Date: Tue Jun 16 21:29:02 2020
New Revision: 362251
URL: https://svnweb.freebsd.org/changeset/base/362251
Log:
rtld: Allow to load ET_DYN && DF_1_PIE when tracing.
This makes old ldd to still work on newer tagged PIE binaries.
Also move debug line for hashes before both decisions to not load are
done, so that the end of digest_dynamic() processing and reason to not
load or load is seen in debug trace.
Noted by: jhb
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cTue Jun 16 21:25:58 2020
(r362250)
+++ head/libexec/rtld-elf/rtld.cTue Jun 16 21:29:02 2020
(r362251)
@@ -2612,12 +2612,13 @@ do_load_object(int fd, const char *name, char *path, s
obj->path = path;
if (!digest_dynamic(obj, 0))
goto errp;
-if (obj->z_pie) {
+dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d", obj->path,
+ obj->valid_hash_sysv, obj->valid_hash_gnu, obj->dynsymcount);
+if (obj->z_pie && (flags & RTLD_LO_TRACE) == 0) {
+ dbg("refusing to load PIE executable \"%s\"", obj->path);
_rtld_error("Cannot load PIE binary %s as DSO", obj->path);
goto errp;
}
-dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d", obj->path,
- obj->valid_hash_sysv, obj->valid_hash_gnu, obj->dynsymcount);
if (obj->z_noopen && (flags & (RTLD_LO_DLOPEN | RTLD_LO_TRACE)) ==
RTLD_LO_DLOPEN) {
dbg("refusing to load non-loadable \"%s\"", obj->path);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r362246 - head/share/man/man9
Hello. I seem to have nothing else to do but looking at trivial commits. Sorry for that. Rick Macklem wrote in <202006162051.05gkpsyx065...@repo.freebsd.org>: |Author: rmacklem |Date: Tue Jun 16 20:51:28 2020 |New Revision: 362246 |URL: https://svnweb.freebsd.org/changeset/base/362246 | |Log: | Update VFS_CHECKEXP.9 for the argument changes done by r362158. ... | This is a content change. ... |+++ head/share/man/man9/VFS_CHECKEXP.9Tue Jun 16 20:51:28 2020 \ ... |-.Fn VFS_CHECKEXP "struct mount *mp" "struct sockaddr *nam" "int *exflag\ |sp" "struct ucred **credanonp" |+.Fo VFS_CHECKEXP |+.Fa "struct mount *mp" |+.Fa "struct sockaddr *nam" |+.Fa "uint64_t *exflagsp" |+.Fa "struct ucred **credanonp" |+.Fa "int *numsecflavor" |+.Fa "int *secflavors" .Fo needs .Fc. | .Sh DESCRIPTION Ok .Sh resets it all, but .Fo opens and .Fc closes. I currently deal with MusicBrainz data (since that single query alone is not offered via JSON but only via XML, so then all and only XML, yippieh), and i get for something like this not well-formed (invalid token) at line 2, column 2968, byte 3007 at /usr/lib/perl5/site_perl/5.28/linux-thread-multi/XML/Parser.pm line 187. (Caused by a tmux mouse-selection copy and paste problem only, everything all right.) I wonder why mandoc lint does not catch such things. Don't you have git commit hooks which catch that. I mean, i do not, but then i am not a professional ^_^ --steffen | |Der Kragenbaer,The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362250 - head/libexec/rtld-elf
Author: kib
Date: Tue Jun 16 21:25:58 2020
New Revision: 362250
URL: https://svnweb.freebsd.org/changeset/base/362250
Log:
rtld: Add debug line for dlopen_object().
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cTue Jun 16 21:23:39 2020
(r362249)
+++ head/libexec/rtld-elf/rtld.cTue Jun 16 21:25:58 2020
(r362250)
@@ -3438,6 +3438,9 @@ dlopen_object(const char *name, int fd, Obj_Entry *ref
RtldLockState mlockstate;
int result;
+dbg("dlopen_object name \"%s\" fd %d refobj \"%s\" lo_flags %#x mode %#x",
+ name != NULL ? name : "", fd, refobj == NULL ? "" :
+ refobj->path, lo_flags, mode);
objlist_init();
if (lockstate == NULL && !(lo_flags & RTLD_LO_EARLY)) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362249 - head/libexec/rtld-elf
Author: kib
Date: Tue Jun 16 21:23:39 2020
New Revision: 362249
URL: https://svnweb.freebsd.org/changeset/base/362249
Log:
Systematically pass RTLD_LO_TRACE to load_needed_objects().
Which makes all calls to load_object() to observe the flag, except the
calls for preloaded DSOs.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cTue Jun 16 21:07:51 2020
(r362248)
+++ head/libexec/rtld-elf/rtld.cTue Jun 16 21:23:39 2020
(r362249)
@@ -721,7 +721,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr
preload_tail = globallist_curr(TAILQ_LAST(_list, obj_entry_q));
dbg("loading needed objects");
-if (load_needed_objects(obj_main, 0) == -1)
+if (load_needed_objects(obj_main, ld_tracing != NULL ? RTLD_LO_TRACE :
+ 0) == -1)
rtld_die();
/* Make a list of all objects loaded at startup. */
@@ -3472,7 +3473,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *ref
}
if (result != -1)
result = load_needed_objects(obj, lo_flags & (RTLD_LO_DLOPEN |
- RTLD_LO_EARLY | RTLD_LO_IGNSTLS));
+ RTLD_LO_EARLY | RTLD_LO_IGNSTLS | RTLD_LO_TRACE));
init_dag(obj);
ref_dag(obj);
if (result != -1)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362248 - head/share/man/man9
Author: pluknet Date: Tue Jun 16 21:07:51 2020 New Revision: 362248 URL: https://svnweb.freebsd.org/changeset/base/362248 Log: Complete a function block with Fc, no content change. Notably, unbreaks rendering with groff. Modified: head/share/man/man9/VFS_CHECKEXP.9 Modified: head/share/man/man9/VFS_CHECKEXP.9 == --- head/share/man/man9/VFS_CHECKEXP.9 Tue Jun 16 20:55:22 2020 (r362247) +++ head/share/man/man9/VFS_CHECKEXP.9 Tue Jun 16 21:07:51 2020 (r362248) @@ -41,6 +41,7 @@ .Fa "struct ucred **credanonp" .Fa "int *numsecflavor" .Fa "int *secflavors" +.Fc .Sh DESCRIPTION The .Fn VFS_CHECKEXP ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362247 - head
Author: rmacklem Date: Tue Jun 16 20:55:22 2020 New Revision: 362247 URL: https://svnweb.freebsd.org/changeset/base/362247 Log: Add an entry for r362158, r362163, which changes struct export_args. Modified: head/RELNOTES Modified: head/RELNOTES == --- head/RELNOTES Tue Jun 16 20:51:28 2020(r362246) +++ head/RELNOTES Tue Jun 16 20:55:22 2020(r362247) @@ -10,6 +10,11 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +r362158, r362163: + struct export_args has changed so that the "user" specified for + the -maproot and -mapall exports(5) options may be in more than + 16 groups. + r361884: sed(1) has learned about hex escapes (e.g. \x27) and will now do the right thing with them, removing the need for printf magic or obnoxious ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362246 - head/share/man/man9
Author: rmacklem Date: Tue Jun 16 20:51:28 2020 New Revision: 362246 URL: https://svnweb.freebsd.org/changeset/base/362246 Log: Update VFS_CHECKEXP.9 for the argument changes done by r362158. The arguments for VFS_CHECKEXP() were changed by r362158. Also, the numsecflavors and secflavors arguments were not documented, so add these as well. This is a content change. Modified: head/share/man/man9/VFS_CHECKEXP.9 Modified: head/share/man/man9/VFS_CHECKEXP.9 == --- head/share/man/man9/VFS_CHECKEXP.9 Tue Jun 16 20:44:51 2020 (r362245) +++ head/share/man/man9/VFS_CHECKEXP.9 Tue Jun 16 20:51:28 2020 (r362246) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 4, 2010 +.Dd June 16, 2020 .Dt VFS_CHECKEXP 9 .Os .Sh NAME @@ -34,7 +34,13 @@ .In sys/param.h .In sys/mount.h .Ft int -.Fn VFS_CHECKEXP "struct mount *mp" "struct sockaddr *nam" "int *exflagsp" "struct ucred **credanonp" +.Fo VFS_CHECKEXP +.Fa "struct mount *mp" +.Fa "struct sockaddr *nam" +.Fa "uint64_t *exflagsp" +.Fa "struct ucred **credanonp" +.Fa "int *numsecflavor" +.Fa "int *secflavors" .Sh DESCRIPTION The .Fn VFS_CHECKEXP @@ -51,6 +57,11 @@ An mbuf containing the network address of the client. Return parameter for the export flags for this client. .It Fa credanonp Return parameter for the anonymous credentials for this client. +.It Fa numsecflavors +Return value for the number of security flavors for this client. +.It Fa secflavors +Must be an array of size MAXSECFLAVORS, in which the security flavors +for this client are returned. .El .Pp The @@ -71,13 +82,15 @@ structure and the address of the client, .Fa nam , to verify that the client can access this file system. .Sh RETURN VALUES -The export flags and anonymous credentials specific to the client (returned -by +The export flags, anonymous credentials and security flavors specific to the +client (returned by .Xr vfs_export_lookup 9 ) will be returned in -.Fa *exflagsp +.Fa *exflagsp , +.Fa *credanonp , +.Fa *numsecflavors and -.Fa *credanonp . +.Fa *secflavors . .Sh SEE ALSO .Xr VFS 9 , .Xr VFS_FHTOVP 9 , ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362245 - stable/12/sys/gnu/dts/riscv
Author: manu Date: Tue Jun 16 20:44:51 2020 New Revision: 362245 URL: https://svnweb.freebsd.org/changeset/base/362245 Log: MFC r355324: Import DTS files for riscv from Linux 5.4 Requested by: mhorne Added: stable/12/sys/gnu/dts/riscv/ - copied from r355324, head/sys/gnu/dts/riscv/ Modified: Directory Properties: stable/12/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362244 - stable/12/sys/modules/dtb/rockchip
Author: manu Date: Tue Jun 16 20:43:42 2020 New Revision: 362244 URL: https://svnweb.freebsd.org/changeset/base/362244 Log: MFC r354117: arm64: rockchip: dts: Build the Khadas board DTS We boot on thoses boards so build them. Submitted by: s199p.wa1...@gmail.com Differential Revision:https://reviews.freebsd.org/D22158 Modified: stable/12/sys/modules/dtb/rockchip/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/modules/dtb/rockchip/Makefile == --- stable/12/sys/modules/dtb/rockchip/Makefile Tue Jun 16 20:41:59 2020 (r362243) +++ stable/12/sys/modules/dtb/rockchip/Makefile Tue Jun 16 20:43:42 2020 (r362244) @@ -1,6 +1,9 @@ # $FreeBSD$ DTS= \ + rockchip/rk3399-khadas-edge-captain.dts \ + rockchip/rk3399-khadas-edge.dts \ + rockchip/rk3399-khadas-edge-v.dts \ rockchip/rk3328-rock64.dts \ rockchip/rk3399-rockpro64.dts ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362243 - stable/12/sys/dev/extres/regulator
Author: manu
Date: Tue Jun 16 20:41:59 2020
New Revision: 362243
URL: https://svnweb.freebsd.org/changeset/base/362243
Log:
MFC r356487:
regulator: fix regnode_method_get_voltage
This method is supposed to write the voltage into uvolt
and return an errno compatible value.
Reviewed by: mmel
Differential Revision:https://reviews.freebsd.org/D23006
Modified:
stable/12/sys/dev/extres/regulator/regulator.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/extres/regulator/regulator.c
==
--- stable/12/sys/dev/extres/regulator/regulator.c Tue Jun 16 20:38:55
2020(r362242)
+++ stable/12/sys/dev/extres/regulator/regulator.c Tue Jun 16 20:41:59
2020(r362243)
@@ -295,8 +295,9 @@ static int
regnode_method_get_voltage(struct regnode *regnode, int *uvolt)
{
- return (regnode->std_param.min_uvolt +
- (regnode->std_param.max_uvolt - regnode->std_param.min_uvolt) / 2);
+ *uvolt = regnode->std_param.min_uvolt +
+ (regnode->std_param.max_uvolt - regnode->std_param.min_uvolt) / 2;
+ return (0);
}
int
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362242 - stable/12/usr.sbin/efibootmgr
Author: manu
Date: Tue Jun 16 20:38:55 2020
New Revision: 362242
URL: https://svnweb.freebsd.org/changeset/base/362242
Log:
MFC r347441:
efibootmgr: Do not add the new boot entry in dry-run is specified
While here fix a typo.
Sponsored-by: Ampere Computing, LLC
Reviewed by: imp
Differential Revision:https://reviews.freebsd.org/D20212
Modified:
stable/12/usr.sbin/efibootmgr/efibootmgr.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/usr.sbin/efibootmgr/efibootmgr.c
==
--- stable/12/usr.sbin/efibootmgr/efibootmgr.c Tue Jun 16 20:36:22 2020
(r362241)
+++ stable/12/usr.sbin/efibootmgr/efibootmgr.c Tue Jun 16 20:38:55 2020
(r362242)
@@ -673,7 +673,7 @@ make_boot_var(const char *label, const char *loader, c
lopt_size = create_loadopt(load_opt_buf, MAX_LOADOPT_LEN, load_attrs,
dp, llen + klen, label, env, env ? strlen(env) + 1 : 0);
if (lopt_size == BAD_LENGTH)
- errx(1, "Can't crate loadopt");
+ errx(1, "Can't create loadopt");
ret = 0;
if (!dry_run) {
@@ -684,7 +684,8 @@ make_boot_var(const char *label, const char *loader, c
if (ret)
err(1, "efi_set_variable");
- add_to_boot_order(bootvar); /* first, still not active */
+ if (!dry_run)
+ add_to_boot_order(bootvar); /* first, still not active */
new_ent = malloc(sizeof(struct entry));
if (new_ent == NULL)
err(1, "malloc");
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362241 - in stable/12/sys: arm64/conf modules/dtb/mv
Author: manu
Date: Tue Jun 16 20:36:22 2020
New Revision: 362241
URL: https://svnweb.freebsd.org/changeset/base/362241
Log:
MFC r351144:
arm64: Add EspressoBin DTB to the build
This will compile the espressobin dts to a dtb file and this will be
install in /boot/dtb/marvell/ during installkernel.
Modified:
stable/12/sys/arm64/conf/GENERIC
stable/12/sys/modules/dtb/mv/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/arm64/conf/GENERIC
==
--- stable/12/sys/arm64/conf/GENERICTue Jun 16 20:35:01 2020
(r362240)
+++ stable/12/sys/arm64/conf/GENERICTue Jun 16 20:36:22 2020
(r362241)
@@ -308,4 +308,4 @@ options FDT
device acpi
# DTBs
-makeoptionsMODULES_EXTRA="dtb/allwinner dtb/rockchip dtb/rpi"
+makeoptionsMODULES_EXTRA="dtb/allwinner dtb/mv dtb/rockchip dtb/rpi"
Modified: stable/12/sys/modules/dtb/mv/Makefile
==
--- stable/12/sys/modules/dtb/mv/Makefile Tue Jun 16 20:35:01 2020
(r362240)
+++ stable/12/sys/modules/dtb/mv/Makefile Tue Jun 16 20:36:22 2020
(r362241)
@@ -1,7 +1,13 @@
# $FreeBSD$
# All the dts files for Marvell systems we support.
+
+.if ${MACHINE_ARCH} == "armv7"
DTS= \
armada-388-clearfog.dts \
armada-388-gp.dts
+.elif ${MACHINE_ARCH} == "aarch64"
+DTS= \
+ marvell/armada-3720-espressobin.dts
+.endif
.include
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362240 - in stable/12/sys: arm64/arm64 dev/ahci dev/pci
Author: manu
Date: Tue Jun 16 20:35:01 2020
New Revision: 362240
URL: https://svnweb.freebsd.org/changeset/base/362240
Log:
MFC r347440, r347929-r347930, r349588
r347440:
ahci: Check if bus is cache-coherent
We do this for FDT systems but not for ACPI ones.
Check the presence of the _CCA attribute.
Sponsored by: Ampere Computing, LLC
Reviewed by: andrew
Differential Revision:https://reviews.freebsd.org/D20144
r347929:
pci: ecam: Do not warn on mismatch of bus_end
We cannot know the bus end number before parsing the MCFG table
so don't set the bus_end before that. If the MCFG table doesn't
exist we will set the configuration base address based on the _CBA
value and set the bus_end to the maximal number allowed by PCI.
Sponsored by: Ampere Computing, LLC
Differential Revision:https://reviews.freebsd.org/D20213
r347930:
pci: ecam: Correctly parse memory and IO region
When activating a resource do not compare the resource id to the adress.
Treat IO region as MEMORY region too.
Submitted by: Tuan Phan (Original Version)
Sponsored by: Ampere Computing, LLC
Differential Revision:https://reviews.freebsd.org/D20214
r349588:
arm64: efi: Map memory IO region as device
Reviewed by: andrew
Sponsored by: Ampere Computing, LLC
Modified:
stable/12/sys/arm64/arm64/efirt_machdep.c
stable/12/sys/dev/ahci/ahci_generic.c
stable/12/sys/dev/pci/pci_host_generic.c
stable/12/sys/dev/pci/pci_host_generic_acpi.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/arm64/arm64/efirt_machdep.c
==
--- stable/12/sys/arm64/arm64/efirt_machdep.c Tue Jun 16 20:35:00 2020
(r362239)
+++ stable/12/sys/arm64/arm64/efirt_machdep.c Tue Jun 16 20:35:01 2020
(r362240)
@@ -208,20 +208,14 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int
mode = VM_MEMATTR_WRITE_THROUGH;
else if ((p->md_attr & EFI_MD_ATTR_WC) != 0)
mode = VM_MEMATTR_WRITE_COMBINING;
- else if ((p->md_attr & EFI_MD_ATTR_UC) != 0)
+ else
mode = VM_MEMATTR_DEVICE;
- else {
- if (bootverbose)
- printf("EFI Runtime entry %d mapping "
- "attributes unsupported\n", i);
- mode = VM_MEMATTR_UNCACHEABLE;
- }
printf("MAP %lx mode %x pages %lu\n", p->md_phys, mode,
p->md_pages);
l3_attr = ATTR_DEFAULT | ATTR_IDX(mode) | ATTR_AP(ATTR_AP_RW) |
L3_PAGE;
- if (mode == VM_MEMATTR_DEVICE)
+ if (mode == VM_MEMATTR_DEVICE || p->md_attr & EFI_MD_ATTR_XP)
l3_attr |= ATTR_UXN | ATTR_PXN;
VM_OBJECT_WLOCK(obj_1t1_pt);
Modified: stable/12/sys/dev/ahci/ahci_generic.c
==
--- stable/12/sys/dev/ahci/ahci_generic.c Tue Jun 16 20:35:00 2020
(r362239)
+++ stable/12/sys/dev/ahci/ahci_generic.c Tue Jun 16 20:35:01 2020
(r362240)
@@ -89,6 +89,7 @@ ahci_fdt_probe(device_t dev)
static int
ahci_acpi_probe(device_t dev)
{
+ struct ahci_controller *ctlr = device_get_softc(dev);
ACPI_HANDLE h;
if ((h = acpi_get_handle(dev)) == NULL)
@@ -98,6 +99,12 @@ ahci_acpi_probe(device_t dev)
pci_get_subclass(dev) == PCIS_STORAGE_SATA &&
pci_get_progif(dev) == PCIP_STORAGE_SATA_AHCI_1_0) {
device_set_desc_copy(dev, "AHCI SATA controller");
+ if (ACPI_FAILURE(acpi_GetInteger(h, "_CCA",
+ >dma_coherent)))
+ ctlr->dma_coherent = 0;
+ if (bootverbose)
+ device_printf(dev, "Bus is%s cache-coherent\n",
+ ctlr->dma_coherent ? "" : " not");
return (BUS_PROBE_DEFAULT);
}
Modified: stable/12/sys/dev/pci/pci_host_generic.c
==
--- stable/12/sys/dev/pci/pci_host_generic.cTue Jun 16 20:35:00 2020
(r362239)
+++ stable/12/sys/dev/pci/pci_host_generic.cTue Jun 16 20:35:01 2020
(r362240)
@@ -359,29 +359,30 @@ generic_pcie_activate_resource(device_t dev, device_t
switch (type) {
case SYS_RES_IOPORT:
+ case SYS_RES_MEMORY:
found = 0;
for (i = 0; i < MAX_RANGES_TUPLES; i++) {
pci_base = sc->ranges[i].pci_base;
phys_base = sc->ranges[i].phys_base;
size = sc->ranges[i].size;
- if ((rid > pci_base) && (rid < (pci_base + size))) {
+ if ((rman_get_start(r) >=
svn commit: r362239 - head/stand/i386/common
Author: tsoome
Date: Tue Jun 16 20:35:00 2020
New Revision: 362239
URL: https://svnweb.freebsd.org/changeset/base/362239
Log:
boot2: need to expand tab output and mask getchar
The BIOS ouput char function does not expand tab.
Mask getchar with 0xFF.
Sponsored by: Netflix, Klara Inc.
Modified:
head/stand/i386/common/cons.c
Modified: head/stand/i386/common/cons.c
==
--- head/stand/i386/common/cons.c Tue Jun 16 20:23:57 2020
(r362238)
+++ head/stand/i386/common/cons.c Tue Jun 16 20:35:00 2020
(r362239)
@@ -53,12 +53,38 @@ xputc(int c)
sio_putc(c);
}
+static void
+getcursor(int *row, int *col)
+{
+ v86.ctl = V86_FLAGS;
+ v86.addr = 0x10;
+ v86.eax = 0x300;
+ v86.ebx = 0x7;
+ v86int();
+
+ if (row != NULL)
+ *row = v86.edx >> 8;
+ if (col != NULL)
+ *col = v86.edx & 0xff;
+}
+
void
putchar(int c)
{
+ int i, col;
- if (c == '\n')
+ switch (c) {
+ case '\n':
xputc('\r');
+ break;
+ case '\t':
+ col = 0;
+ getcursor(NULL, );
+ col = 8 - (col % 8);
+ for (i = 0; i < col; i++)
+ xputc(' ');
+ return;
+ }
xputc(c);
}
@@ -100,7 +126,7 @@ int
getchar(void)
{
- return (xgetc(0));
+ return (xgetc(0) & 0xff);
}
int
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362238 - stable/12/usr.sbin/bsdinstall/scripts
Author: manu Date: Tue Jun 16 20:23:57 2020 New Revision: 362238 URL: https://svnweb.freebsd.org/changeset/base/362238 Log: MFC r346683: bsdinstall: up the interface before calling dhclient Modified: stable/12/usr.sbin/bsdinstall/scripts/netconfig_ipv4 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/bsdinstall/scripts/netconfig_ipv4 == --- stable/12/usr.sbin/bsdinstall/scripts/netconfig_ipv4Tue Jun 16 20:22:56 2020(r362237) +++ stable/12/usr.sbin/bsdinstall/scripts/netconfig_ipv4Tue Jun 16 20:23:57 2020(r362238) @@ -49,6 +49,7 @@ esac dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --yesno 'Would you like to use DHCP to configure this interface?' 0 0 if [ $? -eq $DIALOG_OK ]; then if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then + ifconfig $INTERFACE up dialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0 err=$( dhclient $INTERFACE 2>&1 ) if [ $? -ne 0 ]; then ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362237 - in stable/12: share/man/man9 sys/conf sys/dev/ofw
Author: manu Date: Tue Jun 16 20:22:56 2020 New Revision: 362237 URL: https://svnweb.freebsd.org/changeset/base/362237 Log: MFC r346332: ofw_graph: Add functions for graph bindings Those functions are helpers to work on graph bindings. graphs are mostly use with video related devices. See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/graph.txt?id=4436a3711e3249840e0679e92d3c951bcaf25515 Differential Revision:https://reviews.freebsd.org/D19877 Added: stable/12/share/man/man9/ofw_graph.9 - copied unchanged from r346332, head/share/man/man9/ofw_graph.9 stable/12/sys/dev/ofw/ofw_graph.c - copied unchanged from r346332, head/sys/dev/ofw/ofw_graph.c stable/12/sys/dev/ofw/ofw_graph.h - copied unchanged from r346332, head/sys/dev/ofw/ofw_graph.h Modified: stable/12/sys/conf/files Directory Properties: stable/12/ (props changed) Copied: stable/12/share/man/man9/ofw_graph.9 (from r346332, head/share/man/man9/ofw_graph.9) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/share/man/man9/ofw_graph.9Tue Jun 16 20:22:56 2020 (r362237, copy of r346332, head/share/man/man9/ofw_graph.9) @@ -0,0 +1,106 @@ +.\" Copyright (c) 2019 Emmanuel Vadot +.\" +.\" 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 DEVELOPERS ``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 DEVELOPERS 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$ +.\" +.Dd April 10, 2019 +.Dt ofw_graph 9 +.Os +.Sh NAME +.Nm ofw_graph , +.Nm ofw_graph_get_port_by_idx , +.Nm ofw_graph_port_get_num_endpoints , +.Nm ofw_graph_get_endpoint_by_idx , +.Nm ofw_graph_get_remote_endpoint , +.Nm ofw_graph_get_remote_parent , +.Nm ofw_graph_get_device_by_port_ep , +.Nd Helpers for the graph bindings +.Sh SYNOPSIS +.In dev/ofw/openfirm.h +.In dev/ofw/ofw_graph.h +.Ft phandle_t +.Fn ofw_graph_get_port_by_idx "phandle_t node" "uint32_t idx" +.Ft size_t +.Fn ofw_graph_port_get_num_endpoints "phandle_t port" +.Ft phandle_t +.Fn ofw_graph_get_endpoint_by_idx "phandle_t port" "uint32_t idx" +.Ft phandle_t +.Fn ofw_graph_get_remote_endpoint "phandle_t endpoint" +.Ft phandle_t +.Fn ofw_graph_get_remote_parent "phandle_t remote" +.Ft device_t +.Fn ofw_graph_get_device_by_port_ep "phandle_t node" "uint32_t port_id" "uin32_t ep_id" +.Sh DESCRIPTION +.Pp +The ofw_graph functions are helpers to parse the DTS graph bindings +.Pp +.Fn ofw_graph_get_port_by_idx +return the port with id +.Fa idx . +It will first check node named +.Fa port@idx +and then fallback on checking the +.Fa ports +child for a child node matching the id. If no ports matching +.Fa idx +is found the function return 0. +.Pp +.Fn ofw_graph_port_get_num_endpoints +returns the number of endpoints a port node have. +.Pp +.Fn ofw_graph_get_endpoint_by_idx +return the endpoint with id +.Fa idx . +It will first check if there is a single child named +.Fa endpoint +and returns it if there is. If there is multiple endpoints it will check +the +.Fa reg +property and returns the correct +.Fa phandle_t +or 0 if none match. +.Pp +.Fn ofw_graph_get_remote_endpoint +returns the +.Fa remote-endpoint +property if it exists or 0. +.Pp +.Fn ofw_graph_get_remote_parent +returns the device node corresponding to the +.Fa remote-endpoint +phandle or 0 if none. +.Fn ofw_graph_get_device_by_port_ep +returns the device associated with the port and endpoint or +.Fa NULL +if none. The device driver should have called +.Fn OF_device_register_xref +before. +.Fn +.Sh HISTORY +The +.Nm ofw_graph +functions first appeared in +.Fx 13.0 . +The +.Nm ofw_graph +functions and manual page were written by +.An Emmanuel Vadot Aq Mt m...@freebsd.org . Modified: stable/12/sys/conf/files
svn commit: r362236 - head/usr.sbin/mpsutil
Author: jmallett
Date: Tue Jun 16 19:21:28 2020
New Revision: 362236
URL: https://svnweb.freebsd.org/changeset/base/362236
Log:
Improve unit parsing of mpsutil.
Previously, it used atoi(3) to parse the unit parameter, which would silently
yield a unit of 0 in the presence of an invalid unit number. As most users of
mpsutil(8) are likely to have at least a unit 0, this is could have confusing
results.
This behaviour was particularly unintuitive if one incorrectly passed an
adapter device name, or a device path, instead of a unit number. In addition
to using strtoumax(3) instead of atoi(3) to parse unit numbers, support
stripping a device name (e.g. mps1) or path (e.g. /dev/mps2) to just its unit
number.
Reviewed by: scottl (earlier version)
Modified:
head/usr.sbin/mpsutil/mpsutil.c
Modified: head/usr.sbin/mpsutil/mpsutil.c
==
--- head/usr.sbin/mpsutil/mpsutil.c Tue Jun 16 18:39:56 2020
(r362235)
+++ head/usr.sbin/mpsutil/mpsutil.c Tue Jun 16 19:21:28 2020
(r362236)
@@ -37,6 +37,8 @@ __RCSID("$FreeBSD$");
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -91,6 +93,8 @@ int
main(int ac, char **av)
{
struct mpsutil_command **cmd;
+ uintmax_t unit;
+ char *end;
int ch;
is_mps = !strcmp(getprogname(), "mpsutil");
@@ -98,7 +102,17 @@ main(int ac, char **av)
while ((ch = getopt(ac, av, "u:h?")) != -1) {
switch (ch) {
case 'u':
- mps_unit = atoi(optarg);
+ if (strncmp(optarg, _PATH_DEV, strlen(_PATH_DEV)) == 0)
{
+ optarg += strlen(_PATH_DEV);
+ if (strncmp(optarg, is_mps ? "mps" : "mpr", 3)
!= 0)
+ errx(1, "Invalid device: %s", optarg);
+ }
+ if (strncmp(optarg, is_mps ? "mps" : "mpr", 3) == 0)
+ optarg += 3;
+ unit = strtoumax(optarg, , 10);
+ if (*end != '\0' || unit == UINTMAX_MAX || unit >
INT_MAX)
+ errx(1, "Invalid unit: %s", optarg);
+ mps_unit = unit;
break;
case 'h':
case '?':
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362235 - head/contrib/llvm-project/clang/lib/Driver/ToolChains/Arch
Author: kp
Date: Tue Jun 16 18:39:56 2020
New Revision: 362235
URL: https://svnweb.freebsd.org/changeset/base/362235
Log:
llvm: Default to -mno-relax on RISC-V
Compiling on a RISC-V system fails with 'relocation R_RISCV_ALIGN
requires unimplemented linker relaxation; recompile with -mno-relax'.
Our default linker (ld.lld) doesn't support relaxation, so default to
no-relax so we don't generate object files the linker can't handle.
Reviewed by: mhorne
Sponsored by: Axiado
Differential Revision:https://reviews.freebsd.org/D25210
Modified:
head/contrib/llvm-project/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
Modified: head/contrib/llvm-project/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
==
--- head/contrib/llvm-project/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
Tue Jun 16 18:16:45 2020(r362234)
+++ head/contrib/llvm-project/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
Tue Jun 16 18:39:56 2020(r362235)
@@ -426,8 +426,9 @@ void riscv::getRISCVTargetFeatures(const Driver , co
if (Args.hasArg(options::OPT_ffixed_x31))
Features.push_back("+reserve-x31");
- // -mrelax is default, unless -mno-relax is specified.
- if (Args.hasFlag(options::OPT_mrelax, options::OPT_mno_relax, true))
+ // FreeBSD local, because ld.lld doesn't support relaxations
+ // -mno-relax is default, unless -mrelax is specified.
+ if (Args.hasFlag(options::OPT_mrelax, options::OPT_mno_relax, false))
Features.push_back("+relax");
else
Features.push_back("-relax");
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362234 - head/sys/netinet/tcp_stacks
Author: rrs Date: Tue Jun 16 18:16:45 2020 New Revision: 362234 URL: https://svnweb.freebsd.org/changeset/base/362234 Log: iSo in doing final checks on OCA firmware with all the latest tweaks the dup-ack checking packet drill script was failing with a number of unexpected acks. So it turns out if you have the default recvwin set up to 1Meg (like OCA's do) and you have no window scaling (like the dupack checking code) then we have another case where we are always trying to update the rwnd and sending an ack when we should not. Sponsored by: Netflix Inc. Differential Revision:https://reviews.freebsd.org/D25298 Modified: head/sys/netinet/tcp_stacks/bbr.c head/sys/netinet/tcp_stacks/rack.c Modified: head/sys/netinet/tcp_stacks/bbr.c == --- head/sys/netinet/tcp_stacks/bbr.c Tue Jun 16 17:45:23 2020 (r362233) +++ head/sys/netinet/tcp_stacks/bbr.c Tue Jun 16 18:16:45 2020 (r362234) @@ -12157,8 +12157,8 @@ bbr_output_wtime(struct tcpcb *tp, const struct timeva * have gotten more data into the socket buffer to * send. */ - recwin = min(max(sbspace(>so_rcv), 0), - TCP_MAXWIN << tp->rcv_scale); + recwin = lmin(lmax(sbspace(>so_rcv), 0), + (long)TCP_MAXWIN << tp->rcv_scale); if ((bbr_window_update_needed(tp, so, recwin, maxseg) == 0) && ((tcp_outflags[tp->t_state] & TH_RST) == 0) && ((sbavail(sb) + ((tcp_outflags[tp->t_state] & TH_FIN) ? 1 : 0)) <= @@ -12839,8 +12839,8 @@ recheck_resend: ipoptlen == 0) tso = 1; - recwin = min(max(sbspace(>so_rcv), 0), - TCP_MAXWIN << tp->rcv_scale); + recwin = lmin(lmax(sbspace(>so_rcv), 0), + (long)TCP_MAXWIN << tp->rcv_scale); /* * Sender silly window avoidance. We transmit under the following * conditions when len is non-zero: Modified: head/sys/netinet/tcp_stacks/rack.c == --- head/sys/netinet/tcp_stacks/rack.c Tue Jun 16 17:45:23 2020 (r362233) +++ head/sys/netinet/tcp_stacks/rack.c Tue Jun 16 18:16:45 2020 (r362234) @@ -12750,7 +12750,8 @@ again: flags &= ~TH_FIN; } } - recwin = sbspace(>so_rcv); + recwin = lmin(lmax(sbspace(>so_rcv), 0), + (long)TCP_MAXWIN << tp->rcv_scale); /* * Sender silly window avoidance. We transmit under the following @@ -13656,8 +13657,6 @@ send: if (SEQ_GT(tp->rcv_adv, tp->rcv_nxt) && recwin < (long)(tp->rcv_adv - tp->rcv_nxt)) recwin = (long)(tp->rcv_adv - tp->rcv_nxt); - if (recwin > (long)TCP_MAXWIN << tp->rcv_scale) - recwin = (long)TCP_MAXWIN << tp->rcv_scale; } /* ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362233 - head/usr.sbin/newsyslog
Author: eugen
Date: Tue Jun 16 17:45:23 2020
New Revision: 362233
URL: https://svnweb.freebsd.org/changeset/base/362233
Log:
newsyslog(8): make configuration parser more robust.
Currently newsyslog supports directive that is used
in our default /etc/newsyslog.conf in the following form:
/usr/local/etc/newsyslog.conf.d/*
While this is suitable for ports installing their own rules
for logs rotation, this also makes newsyslog break entire
processing of all files if it encounters single line it cannot parse.
This includes lines referring to nonexistent username/group for log
ownership, so newsyslog stops calling errx() function in the parser.
With this fix, newsyslog uses warnx() instead of errx() in such cases
to print a warning, recover gracefully and continue with execution.
Among other cases, this unbreaks initial creation of log files
having flag "C" at boot time (newsyslog -CN). This is most important
for systems having RAM-based /var file system like nanobsd(8)-based
that rely on newsyslog to bring system log files into existence.
MFC after:1 month
Modified:
head/usr.sbin/newsyslog/newsyslog.c
Modified: head/usr.sbin/newsyslog/newsyslog.c
==
--- head/usr.sbin/newsyslog/newsyslog.c Tue Jun 16 17:05:38 2020
(r362232)
+++ head/usr.sbin/newsyslog/newsyslog.c Tue Jun 16 17:45:23 2020
(r362233)
@@ -1078,9 +1078,11 @@ parse_file(FILE *cf, struct cflist *work_p, struct cfl
q = parse = missing_field(sob(line), errline);
parse = son(line);
- if (!*parse)
- errx(1, "malformed line (missing fields):\n%s",
+ if (!*parse) {
+ warnx("malformed line (missing fields):\n%s",
errline);
+ continue;
+ }
*parse = '\0';
/*
@@ -1132,22 +1134,24 @@ parse_file(FILE *cf, struct cflist *work_p, struct cfl
continue;
}
+#define badline(msg, ...) do { \
+ warnx(msg, __VA_ARGS__);\
+ goto cleanup; \
+} while (0)
+
special = 0;
working = init_entry(q, NULL);
if (strcasecmp(DEFAULT_MARKER, q) == 0) {
special = 1;
- if (*defconf_p != NULL) {
- warnx("Ignoring duplicate entry for %s!", q);
- free_entry(working);
- continue;
- }
+ if (*defconf_p != NULL)
+ badline("Ignoring duplicate entry for %s!", q);
*defconf_p = working;
}
q = parse = missing_field(sob(parse + 1), errline);
parse = son(parse);
if (!*parse)
- errx(1, "malformed line (missing fields):\n%s",
+ badline("malformed line (missing fields):\n%s",
errline);
*parse = '\0';
if ((group = strchr(q, ':')) != NULL ||
@@ -1156,7 +1160,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cfl
if (*q) {
if (!(isnumberstr(q))) {
if ((pwd = getpwnam(q)) == NULL)
- errx(1,
+ badline(
"error in config file; unknown user:\n%s",
errline);
working->uid = pwd->pw_uid;
@@ -1169,7 +1173,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cfl
if (*q) {
if (!(isnumberstr(q))) {
if ((grp = getgrnam(q)) == NULL)
- errx(1,
+ badline(
"error in config file; unknown group:\n%s",
errline);
working->gid = grp->gr_gid;
@@ -1181,7 +1185,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cfl
q = parse = missing_field(sob(parse + 1), errline);
parse = son(parse);
if (!*parse)
- errx(1, "malformed line (missing fields):\n%s",
+ badline("malformed line (missing fields):\n%s",
errline);
*parse = '\0';
} else {
@@ -1190,7 +1194,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cfl
Re: svn commit: r362217 - head/stand/common
> In message <55903c38d363aef2a6f6d0075dd4526b86d51258.ca...@freebsd.org>, > Ian Le > pore writes: > > On Tue, 2020-06-16 at 07:05 +, Toomas Soome wrote: > > > Author: tsoome > > > Date: Tue Jun 16 07:05:03 2020 > > > New Revision: 362217 > > > URL: https://svnweb.freebsd.org/changeset/base/362217 > > > > > > Log: > > > loader: variable i is unused without MBR/GPT support built in > > > > > > Because i is only used as index in for loop, declare it in for > > > statement. > > > > > > > As much as I prefer doing it this way, style(9) doesn't allow for > > variable declarations inside a for() statement (or even inside a local > > block, which is just too 1980s for me, but it is still our standard). Last time I tried to assert that bit of style(9) with respect to inside a local block I was over ridden, so it is probably time to atleast revisit that part of style(9). > Doesn't this use stack for a shorter period of time or does the compiler > optimize this, making this change moot? > > The tradeoff is a few extra bytes of stack for a longer period of time vs a > few extra instructions incrementing and decrementing the stack pointer. I do not think the reasoning had to do with stack space vs instuctions, but more about being able to clearly know about variable reuse and not do it as that can create fun bugs. Tools have modernized since that part of style was written. > -- > Cy Schubert -- Rod Grimes rgri...@freebsd.org ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r362217 - head/stand/common
On 16 Jun 2020, at 19:11, Ed Maste wrote: On Tue, 16 Jun 2020 at 13:01, Ian Lepore wrote: As much as I prefer doing it this way, style(9) doesn't allow for variable declarations inside a for() statement (or even inside a local block, which is just too 1980s for me, but it is still our standard). Perhaps it's time to update style(9) to at least permit these uses, as we've done with the blank line at the beginning of functions with no local variables, and with braces around single-line bodies. We have 431 instances of `for (int i` in sys alone. It’s not so much a question of allowing it as acknowledging reality at this point. Best regards, Kristof ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r362217 - head/stand/common
On 16/06/2020 12:01, Ian Lepore wrote: On Tue, 2020-06-16 at 07:05 +, Toomas Soome wrote: Author: tsoome Date: Tue Jun 16 07:05:03 2020 New Revision: 362217 URL: https://svnweb.freebsd.org/changeset/base/362217 Log: loader: variable i is unused without MBR/GPT support built in Because i is only used as index in for loop, declare it in for statement. As much as I prefer doing it this way, style(9) doesn't allow for variable declarations inside a for() statement (or even inside a local block, which is just too 1980s for me, but it is still our standard). Perhaps style(9) needs updating? I think KNF is mandatory for kernel code only, and is only suggested for userland. Pedro. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r362217 - head/stand/common
On Tue, 16 Jun 2020 at 13:01, Ian Lepore wrote: > > As much as I prefer doing it this way, style(9) doesn't allow for > variable declarations inside a for() statement (or even inside a local > block, which is just too 1980s for me, but it is still our standard). Perhaps it's time to update style(9) to at least permit these uses, as we've done with the blank line at the beginning of functions with no local variables, and with braces around single-line bodies. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r362217 - head/stand/common
In message <55903c38d363aef2a6f6d0075dd4526b86d51258.ca...@freebsd.org>, Ian Le pore writes: > On Tue, 2020-06-16 at 07:05 +, Toomas Soome wrote: > > Author: tsoome > > Date: Tue Jun 16 07:05:03 2020 > > New Revision: 362217 > > URL: https://svnweb.freebsd.org/changeset/base/362217 > > > > Log: > > loader: variable i is unused without MBR/GPT support built in > > > > Because i is only used as index in for loop, declare it in for > > statement. > > > > As much as I prefer doing it this way, style(9) doesn't allow for > variable declarations inside a for() statement (or even inside a local > block, which is just too 1980s for me, but it is still our standard). Doesn't this use stack for a shorter period of time or does the compiler optimize this, making this change moot? The tradeoff is a few extra bytes of stack for a longer period of time vs a few extra instructions incrementing and decrementing the stack pointer. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362232 - head/lib/libc/gen
Author: blackend (doc committer) Date: Tue Jun 16 17:05:38 2020 New Revision: 362232 URL: https://svnweb.freebsd.org/changeset/base/362232 Log: Fix pointer name to match the name used in the function prototype above (and in termios.c). Discussed with: Rodney W. Grimes Modified: head/lib/libc/gen/tcsetattr.3 Modified: head/lib/libc/gen/tcsetattr.3 == --- head/lib/libc/gen/tcsetattr.3 Tue Jun 16 17:02:56 2020 (r362231) +++ head/lib/libc/gen/tcsetattr.3 Tue Jun 16 17:05:38 2020 (r362232) @@ -126,24 +126,24 @@ represented, however, the following symbolic values ar The .Fn cfgetispeed function returns the input baud rate in the termios structure referenced by -.Fa tp . +.Fa t . .Pp The .Fn cfsetispeed function sets the input baud rate in the termios structure referenced by -.Fa tp +.Fa t to .Fa speed . .Pp The .Fn cfgetospeed function returns the output baud rate in the termios structure referenced by -.Fa tp . +.Fa t . .Pp The .Fn cfsetospeed function sets the output baud rate in the termios structure referenced by -.Fa tp +.Fa t to .Fa speed . .Pp @@ -151,7 +151,7 @@ The .Fn cfsetspeed function sets both the input and output baud rate in the termios structure referenced by -.Fa tp +.Fa t to .Fa speed . .Pp @@ -210,7 +210,7 @@ function copies the parameters associated with the ter by .Fa fd in the termios structure referenced by -.Fa tp . +.Fa t . This function is allowed from a background process, however, the terminal attributes may be subsequently changed by a foreground process. .Pp @@ -218,7 +218,7 @@ The .Fn tcsetattr function sets the parameters associated with the terminal from the termios structure referenced by -.Fa tp . +.Fa t . The .Fa action argument is created by ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362231 - head/sys/kern
Author: sjg
Date: Tue Jun 16 17:02:56 2020
New Revision: 362231
URL: https://svnweb.freebsd.org/changeset/base/362231
Log:
Make KENV_MVALLEN tunable
When doing secure boot, loader wants to export loader.ve.hashed
the value of which typically exceeds KENV_MVALLEN.
Replace use of KENV_MVALLEN with tunable kenv_mvallen.
Add getenv_string_buffer() for the case where a stack buffer cannot be
created and use uma_zone_t kenv_zone for suitably sized buffers.
Reviewed by: stevek, kevans
Obtained from:Abhishek Kulkarni
MFC after:1 week
Sponsored by: Juniper Networks
Differential Revision: https://reviews.freebsd.org//D25259
Modified:
head/sys/kern/kern_environment.c
Modified: head/sys/kern/kern_environment.c
==
--- head/sys/kern/kern_environment.cTue Jun 16 16:48:52 2020
(r362230)
+++ head/sys/kern/kern_environment.cTue Jun 16 17:02:56 2020
(r362231)
@@ -63,6 +63,9 @@ static MALLOC_DEFINE(M_KENV, "kenv", "kernel environme
#define KENV_SIZE 512 /* Maximum number of environment strings */
+static uma_zone_t kenv_zone;
+static int kenv_mvallen = KENV_MVALLEN;
+
/* pointer to the config-generated static environment */
char *kern_envp;
@@ -85,6 +88,8 @@ bool dynamic_kenv;
#define KENV_CHECK if (!dynamic_kenv) \
panic("%s: called before SI_SUB_KMEM", __func__)
+static char*getenv_string_buffer(const char *);
+
int
sys_kenv(td, uap)
struct thread *td;
@@ -110,9 +115,9 @@ sys_kenv(td, uap)
#endif
done = needed = 0;
buflen = uap->len;
- if (buflen > KENV_SIZE * (KENV_MNAMELEN + KENV_MVALLEN + 2))
+ if (buflen > KENV_SIZE * (KENV_MNAMELEN + kenv_mvallen + 2))
buflen = KENV_SIZE * (KENV_MNAMELEN +
- KENV_MVALLEN + 2);
+ kenv_mvallen + 2);
if (uap->len > 0 && uap->value != NULL)
buffer = malloc(buflen, M_TEMP, M_WAITOK|M_ZERO);
mtx_lock(_lock);
@@ -185,8 +190,8 @@ sys_kenv(td, uap)
error = EINVAL;
goto done;
}
- if (len > KENV_MVALLEN + 1)
- len = KENV_MVALLEN + 1;
+ if (len > kenv_mvallen + 1)
+ len = kenv_mvallen + 1;
value = malloc(len, M_TEMP, M_WAITOK);
error = copyinstr(uap->value, value, len, NULL);
if (error) {
@@ -327,7 +332,7 @@ init_dynamic_kenv_from(char *init_env, int *curpos)
for (cp = init_env; cp != NULL; cp = cpnext) {
cpnext = kernenv_next(cp);
len = strlen(cp) + 1;
- if (len > KENV_MNAMELEN + 1 + KENV_MVALLEN + 1) {
+ if (len > KENV_MNAMELEN + 1 + kenv_mvallen + 1) {
printf(
"WARNING: too long kenv string, ignoring %s\n",
cp);
@@ -375,7 +380,14 @@ static void
init_dynamic_kenv(void *data __unused)
{
int dynamic_envpos;
+ int size;
+ TUNABLE_INT_FETCH("kenv_mvallen", _mvallen);
+ size = KENV_MNAMELEN + 1 + kenv_mvallen + 1;
+
+ kenv_zone = uma_zcreate("kenv", size, NULL, NULL, NULL, NULL,
+ UMA_ALIGN_PTR, 0);
+
kenvp = malloc((KENV_SIZE + 1) * sizeof(char *), M_KENV,
M_WAITOK | M_ZERO);
@@ -395,7 +407,7 @@ freeenv(char *env)
if (dynamic_kenv && env != NULL) {
explicit_bzero(env, strlen(env));
- free(env, M_KENV);
+ uma_zfree(kenv_zone, env);
}
}
@@ -470,14 +482,11 @@ _getenv_static(const char *name)
char *
kern_getenv(const char *name)
{
- char buf[KENV_MNAMELEN + 1 + KENV_MVALLEN + 1];
char *ret;
if (dynamic_kenv) {
- if (getenv_string(name, buf, sizeof(buf))) {
- ret = strdup(buf, M_KENV);
- } else {
- ret = NULL;
+ ret = getenv_string_buffer(name);
+ if (ret == NULL) {
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
"getenv");
}
@@ -548,7 +557,7 @@ kern_setenv(const char *name, const char *value)
if (namelen > KENV_MNAMELEN + 1)
return (-1);
vallen = strlen(value) + 1;
- if (vallen > KENV_MVALLEN + 1)
+ if (vallen > kenv_mvallen + 1)
return (-1);
buf = malloc(namelen + vallen, M_KENV, M_WAITOK);
sprintf(buf, "%s=%s", name, value);
@@ -607,6 +616,33 @@ kern_unsetenv(const char *name)
}
/*
+ * Return a buffer containing the string value from an environment variable
+ */
+static char *
Re: svn commit: r362217 - head/stand/common
On Tue, 2020-06-16 at 07:05 +, Toomas Soome wrote: > Author: tsoome > Date: Tue Jun 16 07:05:03 2020 > New Revision: 362217 > URL: https://svnweb.freebsd.org/changeset/base/362217 > > Log: > loader: variable i is unused without MBR/GPT support built in > > Because i is only used as index in for loop, declare it in for > statement. > As much as I prefer doing it this way, style(9) doesn't allow for variable declarations inside a for() statement (or even inside a local block, which is just too 1980s for me, but it is still our standard). -- Ian ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362230 - in head/lib: libc/capability libc/gen libc/sys libcasper/libcasper libcasper/services/cap_dns libcasper/services/cap_fileargs libcasper/services/cap_grp libcasper/services/cap...
Author: gbe (doc committer) Date: Tue Jun 16 16:48:52 2020 New Revision: 362230 URL: https://svnweb.freebsd.org/changeset/base/362230 Log: libcasper(3): Document HISTORY within the manpages Reviewed by: bcr (mentor) Approved by: bcr (mentor) MFC after:7 days Differential Revision:https://reviews.freebsd.org/D24695 Modified: head/lib/libc/capability/cap_rights_init.3 head/lib/libc/gen/cap_rights_get.3 head/lib/libc/gen/cap_sandboxed.3 head/lib/libc/sys/cap_enter.2 head/lib/libc/sys/cap_fcntls_limit.2 head/lib/libc/sys/cap_ioctls_limit.2 head/lib/libc/sys/cap_rights_limit.2 head/lib/libcasper/libcasper/libcasper.3 head/lib/libcasper/libcasper/libcasper_service.3 head/lib/libcasper/services/cap_dns/cap_dns.3 head/lib/libcasper/services/cap_fileargs/cap_fileargs.3 head/lib/libcasper/services/cap_grp/cap_grp.3 head/lib/libcasper/services/cap_pwd/cap_pwd.3 head/lib/libcasper/services/cap_sysctl/cap_sysctl.3 head/lib/libcasper/services/cap_syslog/cap_syslog.3 Modified: head/lib/libc/capability/cap_rights_init.3 == --- head/lib/libc/capability/cap_rights_init.3 Tue Jun 16 15:54:59 2020 (r362229) +++ head/lib/libc/capability/cap_rights_init.3 Tue Jun 16 16:48:52 2020 (r362230) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 27, 2014 +.Dd May 5, 2020 .Dt CAP_RIGHTS_INIT 3 .Os .Sh NAME @@ -232,6 +232,18 @@ if (cap_rights_limit(fd, ) < 0 && errno != ENOS .Xr capsicum 4 , .Xr rights 4 .Sh HISTORY +The functions +.Fn cap_rights_init , +.Fn cap_rights_set , +.Fn cap_rights_clear , +.Fn cap_rights_is_set , +.Fn cap_rights_is_valid , +.Fn cap_rights_merge , +.Fn cap_rights_remove +and +.Fn cap_rights_contains +first appeared in +.Fx 8.3 . Support for capabilities and capabilities mode was developed as part of the .Tn TrustedBSD Project. Modified: head/lib/libc/gen/cap_rights_get.3 == --- head/lib/libc/gen/cap_rights_get.3 Tue Jun 16 15:54:59 2020 (r362229) +++ head/lib/libc/gen/cap_rights_get.3 Tue Jun 16 16:48:52 2020 (r362230) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 27, 2014 +.Dd May 5, 2020 .Dt CAP_RIGHTS_GET 3 .Os .Sh NAME @@ -110,6 +110,10 @@ argument points at an invalid address. .Xr capsicum 4 , .Xr rights 4 .Sh HISTORY +The +.Fn cap_rights_get +function first appeared in +.Fx 9.2 . Support for capabilities and capabilities mode was developed as part of the .Tn TrustedBSD Project. Modified: head/lib/libc/gen/cap_sandboxed.3 == --- head/lib/libc/gen/cap_sandboxed.3 Tue Jun 16 15:54:59 2020 (r362229) +++ head/lib/libc/gen/cap_sandboxed.3 Tue Jun 16 16:48:52 2020 (r362230) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 27, 2014 +.Dd May 5, 2020 .Dt CAP_SANDBOXED 3 .Os .Sh NAME @@ -65,6 +65,11 @@ or .Sh SEE ALSO .Xr cap_enter 2 , .Xr capsicum 4 +.Sh HISTORY +The +.Fn cap_sandboxed +function first appeared in +.Fx 9.2 . .Sh AUTHORS This function was implemented and manual page was written by .An Pawel Jakub Dawidek Aq Mt pa...@dawidek.net Modified: head/lib/libc/sys/cap_enter.2 == --- head/lib/libc/sys/cap_enter.2 Tue Jun 16 15:54:59 2020 (r362229) +++ head/lib/libc/sys/cap_enter.2 Tue Jun 16 16:48:52 2020 (r362230) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 23, 2017 +.Dd May 5, 2020 .Dt CAP_ENTER 2 .Os .Sh NAME @@ -150,6 +150,10 @@ points outside the process's allocated address space. .Xr capsicum 4 , .Xr sysctl 9 .Sh HISTORY +The +.Fn cap_getmode +system call first appeared in +.Fx 8.3 . Support for capabilities and capabilities mode was developed as part of the .Tn TrustedBSD Project. Modified: head/lib/libc/sys/cap_fcntls_limit.2 == --- head/lib/libc/sys/cap_fcntls_limit.2Tue Jun 16 15:54:59 2020 (r362229) +++ head/lib/libc/sys/cap_fcntls_limit.2Tue Jun 16 16:48:52 2020 (r362230) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 27, 2014 +.Dd May 5, 2020 .Dt CAP_FCNTLS_LIMIT 2 .Os .Sh NAME @@ -117,6 +117,12 @@ argument points at an invalid address. .Xr cap_rights_limit 2 , .Xr fcntl 2 .Sh HISTORY +The +.Fn cap_fcntls_get +and +.Fn cap_fcntls_limit +system calls first appeared in +.Fx 8.3 . Support for capabilities and capabilities mode was developed as part of the .Tn TrustedBSD Project. Modified: head/lib/libc/sys/cap_ioctls_limit.2 == --- head/lib/libc/sys/cap_ioctls_limit.2Tue Jun 16 15:54:59 2020 (r362229) +++ head/lib/libc/sys/cap_ioctls_limit.2Tue Jun 16 16:48:52 2020
svn commit: r362229 - head/usr.bin/cmp
Author: fernape (ports committer) Date: Tue Jun 16 15:54:59 2020 New Revision: 362229 URL: https://svnweb.freebsd.org/changeset/base/362229 Log: cmp(1): Add EXAMPLES section Add simple examples showing the use of -l, -z, stdin and offsets Approved by: bcr@ Differential Revision: https://reviews.freebsd.org/D25280 Modified: head/usr.bin/cmp/cmp.1 Modified: head/usr.bin/cmp/cmp.1 == --- head/usr.bin/cmp/cmp.1 Tue Jun 16 14:02:51 2020(r362228) +++ head/usr.bin/cmp/cmp.1 Tue Jun 16 15:54:59 2020(r362229) @@ -31,7 +31,7 @@ .\" @(#)cmp.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd May 1, 2018 +.Dd June 16, 2020 .Dt CMP 1 .Os .Sh NAME @@ -106,6 +106,40 @@ file (before any differences were found). .It >1 An error occurred. .El +.Sh EXAMPLES +Assuming a file named example.txt with the following contents: +.Bd -literal -offset indent +a +b +c +.Ed +.Pp +Compare stdin with example.txt: +.Bd -literal -offset indent +$ echo -e "a\\nb\\nc" | cmp - example.txt +.Ed +.Pp +Same as above but introducing a change in byte three in stdin. +Show the byte number (decimal) and differing byte (octal): +.Bd -literal -offset indent +$ echo -e "a\\nR\\nc" | cmp -l - example.txt + 3 122 142 +.Ed +.Pp +Compare example.txt and /boot/loader.conf exiting if size differs. +Note that +.Fl z +can only be used with regular files: +.Bd -literal -offset indent +$ cmp -z example.txt /boot/loader.conf +example.txt /boot/loader.conf differ: size +.Ed +.Pp +Compare stdin with file example.txt omitting the 4 first bytes from stdin and +the 2 first bytes from example.txt: +.Bd -literal -offset indent +$ echo -e "a\\nR\\nb\\nc" | cmp - example.txt 4 2 +.Ed .Sh SEE ALSO .Xr diff 1 , .Xr diff3 1 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362228 - stable/11/release/doc/share/xml
Author: gjb Date: Tue Jun 16 14:02:51 2020 New Revision: 362228 URL: https://svnweb.freebsd.org/changeset/base/362228 Log: Prune the SA/EN entries for the 11.4 errata page. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: stable/11/release/doc/share/xml/errata.xml stable/11/release/doc/share/xml/security.xml Modified: stable/11/release/doc/share/xml/errata.xml == --- stable/11/release/doc/share/xml/errata.xml Tue Jun 16 13:59:51 2020 (r362227) +++ stable/11/release/doc/share/xml/errata.xml Tue Jun 16 14:02:51 2020 (r362228) @@ -19,92 +19,9 @@ - FreeBSD-EN-19:13.mds - 24July2019 - System crash from Intel CPU vulnerability - mitigation - - - - FreeBSD-EN-19:15.libunwind - 6August2019 - Incorrect exception handling - - - - FreeBSD-EN-19:16.bhyve - 20August2019 - Instruction emulation improvements - - - - FreeBSD-EN-19:17.ipfw - 20August2019 - jail keyword fix - - - - FreeBSD-EN-19:18.tzdata - 23October2019 - Timezone database information - update - - - - FreeBSD-EN-20:01.ssp - 28January2020 - Imprecise orderring of canary - initialization - - - - FreeBSD-EN-20:02.nmount - 28January2020 - Invalid pointer dereference - - - - FreeBSD-EN-20:04.pfctl - 18March2020 - Missing tunable - - - - FreeBSD-EN-20:06.ipv6 - 18March2020 - Incorrect checksum calculations - - - - FreeBSD-EN-20:07.quotad - 21April2020 - Regression with certain NFS - servers - - - - FreeBSD-EN-20:08.tzdata - 12May2020 - Timezone database update - - - - FreeBSD-EN-20:10.build - 12May2020 - Incorrect build host clang version - detection + No notices. + + Modified: stable/11/release/doc/share/xml/security.xml == --- stable/11/release/doc/share/xml/security.xmlTue Jun 16 13:59:51 2020(r362227) +++ stable/11/release/doc/share/xml/security.xmlTue Jun 16 14:02:51 2020(r362228) @@ -19,209 +19,9 @@ - FreeBSD-SA-19:12.telnet - 24July2019 - Multiple vulnerabilities - - - - FreeBSD-SA-19:13.pts - 24July2019 - Write-after-free vulnerability - - - - FreeBSD-SA-19:14.freebsd32 - 24July2019 - Kernel memory disclosure - - - - FreeBSD-SA-19:15.mqueuefs - 24July2019 - Reference count overflow - - - - FreeBSD-SA-19:16.bhyve - 24July2019 -out-of-bounds read - - - - FreeBSD-SA-19:17.fd - 24July2019 - Reference count leak - - - - FreeBSD-SA-19:18.bzip2 - 6August2019 - Multiple vulnerabilities - - - - FreeBSD-SA-19:19.mldv2 - 6August2019 - Out-of-bounds memory access - - - - FreeBSD-SA-19:20.bsnmp - 6August2019 - Insufficient message length - validation - - - - FreeBSD-SA-19:21.bhyve - 6August2019 - Insufficient validation of guest-supplied - data - - - - FreeBSD-SA-19:22.mbuf - 20August2019 - IPv6 remove denial-of-service - - - - FreeBSD-SA-19:23.midi - 20August2019 - Kernel memory disclosure - - - - FreeBSD-SA-19:24.mqueuefs - 20August2019 - Reference count overflow - - - - FreeBSD-SA-19:25.mcepce - 12November2019 - Machine Check Exception on Page Size - Change - - - - FreeBSD-SA-19:26.mcu - 12November2019 - Intel CPU Microcode Update - - - - FreeBSD-SA-20:01.libfetch - 28January2020 -buffer overflow - - - - FreeBSD-SA-20:03.thrmisc - 28January2020 - Kernel stack data disclosure - - - - FreeBSD-SA-20:04.tcp - 18March2020 - TCP IPv6 SYN cache kernel information - disclosure - - - - FreeBSD-SA-20:05.if_oce_ioctl - 18March2020 - Insufficient privilege - checking - - - - FreeBSD-SA-20:07.epair - 18March2020 - Incorrect user-controlled pointer - use - - - - FreeBSD-SA-20:08.jail - 18March2020 - Kernel memory disclosure with nested - jails - - - - FreeBSD-SA-20:09.ntp - 18March2020 - Multiple denial of service - - - - FreeBSD-SA-20:10.ipfw - 21April2020 - Invalid
svn commit: r362227 - release/11.4.0
Author: gjb Date: Tue Jun 16 13:59:51 2020 New Revision: 362227 URL: https://svnweb.freebsd.org/changeset/base/362227 Log: Tag releng/11.4@r362094 as release/11.4.0 (11.4-RELEASE). Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Added: release/11.4.0/ - copied from r362094, releng/11.4/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362226 - head/share/man/man5
Author: bapt Date: Tue Jun 16 12:40:19 2020 New Revision: 362226 URL: https://svnweb.freebsd.org/changeset/base/362226 Log: Fix typo in the documentation about the daily ntpd status PR: 245679 Submitted by: Taylor Stearns MFC after:3 days Modified: head/share/man/man5/periodic.conf.5 Modified: head/share/man/man5/periodic.conf.5 == --- head/share/man/man5/periodic.conf.5 Tue Jun 16 12:26:23 2020 (r362225) +++ head/share/man/man5/periodic.conf.5 Tue Jun 16 12:40:19 2020 (r362226) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 7, 2018 +.Dd June 16, 2020 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -518,7 +518,7 @@ for the previous day. .Pq Vt num Set to the number of maillog files that should be checked for yesterday's mail rejects. -.It Va daily_status_ntpd +.It Va daily_status_ntpd_enable .Pq Vt bool Set to .Dq Li YES ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362225 - head/sys/netinet/tcp_stacks
Author: rrs
Date: Tue Jun 16 12:26:23 2020
New Revision: 362225
URL: https://svnweb.freebsd.org/changeset/base/362225
Log:
So it turns out rack has a shortcoming in dup-ack counting. It counts the
dupacks but
then does not properly respond to them. This is because a few missing bits
are not present.
BBR actually does properly respond (though it also sends a TLP which is
interesting and
maybe something to fix)..
Sponsored by: Netflix Inc.
Differential Revision:https://reviews.freebsd.org/D25294
Modified:
head/sys/netinet/tcp_stacks/rack.c
Modified: head/sys/netinet/tcp_stacks/rack.c
==
--- head/sys/netinet/tcp_stacks/rack.c Tue Jun 16 12:21:55 2020
(r362224)
+++ head/sys/netinet/tcp_stacks/rack.c Tue Jun 16 12:26:23 2020
(r362225)
@@ -4588,7 +4588,7 @@ activate_rxt:
goto activate_rxt;
}
/* Convert from ms to usecs */
- if (rsm->r_flags & RACK_SACK_PASSED) {
+ if ((rsm->r_flags & RACK_SACK_PASSED) || (rsm->r_dupack >=
DUP_ACK_THRESHOLD)) {
if ((tp->t_flags & TF_SENTFIN) &&
((tp->snd_max - tp->snd_una) == 1) &&
(rsm->r_flags & RACK_HAS_FIN)) {
@@ -6237,7 +6237,7 @@ rack_log_output(struct tcpcb *tp, struct tcpopt *to, i
* or FIN if seq_out is adding more on and a FIN is present
* (and we are not resending).
*/
- if ((th_flags & TH_SYN) && (seq_out == tp->iss))
+ if ((th_flags & TH_SYN) && (seq_out == tp->iss))
len++;
if (th_flags & TH_FIN)
len++;
@@ -8190,6 +8190,7 @@ rack_strike_dupack(struct tcp_rack *rack)
rsm->r_dupack++;
if (rsm->r_dupack >= DUP_ACK_THRESHOLD) {
rack->r_wanted_output = 1;
+ rack->r_timer_override = 1;
rack_log_retran_reason(rack, rsm, __LINE__, 1, 3);
} else {
rack_log_retran_reason(rack, rsm, __LINE__, 0, 3);
@@ -11359,7 +11360,8 @@ check_it:
if (rsm->r_flags & RACK_ACKED) {
return (NULL);
}
- if ((rsm->r_flags & RACK_SACK_PASSED) == 0) {
+ if (((rsm->r_flags & RACK_SACK_PASSED) == 0) &&
+ (rsm->r_dupack < DUP_ACK_THRESHOLD)) {
/* Its not yet ready */
return (NULL);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362224 - in stable: 10/lib/libusb 11/lib/libusb 12/lib/libusb 9/lib/libusb
Author: kevans
Date: Tue Jun 16 12:21:55 2020
New Revision: 362224
URL: https://svnweb.freebsd.org/changeset/base/362224
Log:
MFC r361977: libusb: improve compatibility
Specifically, add LIBUSB_CLASS_PHYSICAL and the libusb_has_capability API.
Descriptions and functionality for these derived from the
documentation at [0]. The current set of capabilities are all supported by
libusb.
These were detected as missing after updating net/freerdp to 2.1.1, which
attempted to use both.
[0] http://libusb.sourceforge.net/api-1.0/group__libusb__misc.html
Modified:
stable/9/lib/libusb/Makefile
stable/9/lib/libusb/libusb.3
stable/9/lib/libusb/libusb.h
stable/9/lib/libusb/libusb10.c
Directory Properties:
stable/9/ (props changed)
stable/9/lib/ (props changed)
stable/9/lib/libusb/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/lib/libusb/Makefile
stable/10/lib/libusb/libusb.3
stable/10/lib/libusb/libusb.h
stable/10/lib/libusb/libusb10.c
stable/11/lib/libusb/Makefile
stable/11/lib/libusb/libusb.3
stable/11/lib/libusb/libusb.h
stable/11/lib/libusb/libusb10.c
stable/12/lib/libusb/Makefile
stable/12/lib/libusb/libusb.3
stable/12/lib/libusb/libusb.h
stable/12/lib/libusb/libusb10.c
Directory Properties:
stable/10/ (props changed)
stable/11/ (props changed)
stable/12/ (props changed)
Modified: stable/9/lib/libusb/Makefile
==
--- stable/9/lib/libusb/MakefileTue Jun 16 12:16:35 2020
(r362223)
+++ stable/9/lib/libusb/MakefileTue Jun 16 12:21:55 2020
(r362224)
@@ -44,6 +44,7 @@ CFLAGS+= -DCOMPAT_32BIT
MLINKS += libusb.3 libusb_get_version.3
MLINKS += libusb.3 libusb_init.3
MLINKS += libusb.3 libusb_exit.3
+MLINKS += libusb.3 libusb_has_capability.3
MLINKS += libusb.3 libusb_strerror.3
MLINKS += libusb.3 libusb_error_name.3
MLINKS += libusb.3 libusb_set_debug.3
Modified: stable/9/lib/libusb/libusb.3
==
--- stable/9/lib/libusb/libusb.3Tue Jun 16 12:16:35 2020
(r362223)
+++ stable/9/lib/libusb/libusb.3Tue Jun 16 12:21:55 2020
(r362224)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 23, 2016
+.Dd June 16, 2020
.Dt LIBUSB 3
.Os
.Sh NAME
@@ -60,6 +60,33 @@ failure.
Deinitialise libusb.
Must be called at the end of the application.
Other libusb routines may not be called after this function.
+.Pp
+.Ft int
+.Fn libusb_has_capability "uint32_t capability"
+This function checks the runtime capabilities of
+.Nm .
+This function will return non-zero if the given
+.Fa capability
+is supported, 0 if it is not supported.
+The valid values for
+.Fa capability
+are:
+.Bl -tag -width LIBUSB_CAP -offset indent
+.It Va LIBUSB_CAP_HAS_CAPABILITY
+.Nm
+supports
+.Fn libusb_has_capability .
+.It Va LIBUSB_CAP_HAS_HOTPLUG
+.Nm
+supports hotplug notifications.
+.It Va LIBUSB_CAP_HAS_HID_ACCESS
+.Nm
+can access HID devices without requiring user intervention.
+.It Va LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER
+.Nm
+supports detaching of the default USB driver with
+.Fn libusb_detach_kernel_driver .
+.El
.Pp
.Ft const char *
.Fn libusb_strerror "int code"
Modified: stable/9/lib/libusb/libusb.h
==
--- stable/9/lib/libusb/libusb.hTue Jun 16 12:16:35 2020
(r362223)
+++ stable/9/lib/libusb/libusb.hTue Jun 16 12:21:55 2020
(r362224)
@@ -49,6 +49,7 @@ enum libusb_class_code {
LIBUSB_CLASS_AUDIO = 1,
LIBUSB_CLASS_COMM = 2,
LIBUSB_CLASS_HID = 3,
+ LIBUSB_CLASS_PHYSICAL = 5,
LIBUSB_CLASS_PTP = 6,
LIBUSB_CLASS_IMAGE = 6,
LIBUSB_CLASS_PRINTER = 7,
@@ -173,6 +174,21 @@ enum libusb_bos_type {
LIBUSB_BT_CONTAINER_ID = 4,
};
+enum libusb_capability {
+ /* libusb supports libusb_has_capability(). */
+ LIBUSB_CAP_HAS_CAPABILITY = 0,
+ /* Hotplug support is available. */
+ LIBUSB_CAP_HAS_HOTPLUG,
+ /* Can access HID devices without requiring user intervention. */
+ LIBUSB_CAP_HAS_HID_ACCESS,
+
+ /*
+* Supports detaching of the default USB driver with
+* libusb_detach_kernel_driver().
+*/
+ LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER,
+};
+
enum libusb_error {
LIBUSB_SUCCESS = 0,
LIBUSB_ERROR_IO = -1,
@@ -432,6 +448,7 @@ const char *libusb_strerror(int code);
const char *libusb_error_name(int code);
intlibusb_init(libusb_context ** context);
void libusb_exit(struct libusb_context *ctx);
+intlibusb_has_capability(uint32_t capability);
/* Device handling and enumeration */
Modified: stable/9/lib/libusb/libusb10.c
==
--- stable/9/lib/libusb/libusb10.c Tue Jun 16 12:16:35
svn commit: r362224 - in stable: 10/lib/libusb 11/lib/libusb 12/lib/libusb 9/lib/libusb
Author: kevans
Date: Tue Jun 16 12:21:55 2020
New Revision: 362224
URL: https://svnweb.freebsd.org/changeset/base/362224
Log:
MFC r361977: libusb: improve compatibility
Specifically, add LIBUSB_CLASS_PHYSICAL and the libusb_has_capability API.
Descriptions and functionality for these derived from the
documentation at [0]. The current set of capabilities are all supported by
libusb.
These were detected as missing after updating net/freerdp to 2.1.1, which
attempted to use both.
[0] http://libusb.sourceforge.net/api-1.0/group__libusb__misc.html
Modified:
stable/12/lib/libusb/Makefile
stable/12/lib/libusb/libusb.3
stable/12/lib/libusb/libusb.h
stable/12/lib/libusb/libusb10.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/lib/libusb/Makefile
stable/10/lib/libusb/libusb.3
stable/10/lib/libusb/libusb.h
stable/10/lib/libusb/libusb10.c
stable/11/lib/libusb/Makefile
stable/11/lib/libusb/libusb.3
stable/11/lib/libusb/libusb.h
stable/11/lib/libusb/libusb10.c
stable/9/lib/libusb/Makefile
stable/9/lib/libusb/libusb.3
stable/9/lib/libusb/libusb.h
stable/9/lib/libusb/libusb10.c
Directory Properties:
stable/10/ (props changed)
stable/11/ (props changed)
stable/9/ (props changed)
stable/9/lib/ (props changed)
stable/9/lib/libusb/ (props changed)
Modified: stable/12/lib/libusb/Makefile
==
--- stable/12/lib/libusb/Makefile Tue Jun 16 12:16:35 2020
(r362223)
+++ stable/12/lib/libusb/Makefile Tue Jun 16 12:21:55 2020
(r362224)
@@ -69,6 +69,7 @@ CFLAGS+= -I ../../sys
MLINKS += libusb.3 libusb_get_version.3
MLINKS += libusb.3 libusb_init.3
MLINKS += libusb.3 libusb_exit.3
+MLINKS += libusb.3 libusb_has_capability.3
MLINKS += libusb.3 libusb_strerror.3
MLINKS += libusb.3 libusb_error_name.3
MLINKS += libusb.3 libusb_set_debug.3
Modified: stable/12/lib/libusb/libusb.3
==
--- stable/12/lib/libusb/libusb.3 Tue Jun 16 12:16:35 2020
(r362223)
+++ stable/12/lib/libusb/libusb.3 Tue Jun 16 12:21:55 2020
(r362224)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 11, 2018
+.Dd June 9, 2020
.Dt LIBUSB 3
.Os
.Sh NAME
@@ -60,6 +60,33 @@ failure.
Deinitialise libusb.
Must be called at the end of the application.
Other libusb routines may not be called after this function.
+.Pp
+.Ft int
+.Fn libusb_has_capability "uint32_t capability"
+This function checks the runtime capabilities of
+.Nm .
+This function will return non-zero if the given
+.Fa capability
+is supported, 0 if it is not supported.
+The valid values for
+.Fa capability
+are:
+.Bl -tag -width LIBUSB_CAP -offset indent
+.It Va LIBUSB_CAP_HAS_CAPABILITY
+.Nm
+supports
+.Fn libusb_has_capability .
+.It Va LIBUSB_CAP_HAS_HOTPLUG
+.Nm
+supports hotplug notifications.
+.It Va LIBUSB_CAP_HAS_HID_ACCESS
+.Nm
+can access HID devices without requiring user intervention.
+.It Va LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER
+.Nm
+supports detaching of the default USB driver with
+.Fn libusb_detach_kernel_driver .
+.El
.Pp
.Ft const char *
.Fn libusb_strerror "int code"
Modified: stable/12/lib/libusb/libusb.h
==
--- stable/12/lib/libusb/libusb.h Tue Jun 16 12:16:35 2020
(r362223)
+++ stable/12/lib/libusb/libusb.h Tue Jun 16 12:21:55 2020
(r362224)
@@ -54,6 +54,7 @@ enum libusb_class_code {
LIBUSB_CLASS_AUDIO = 1,
LIBUSB_CLASS_COMM = 2,
LIBUSB_CLASS_HID = 3,
+ LIBUSB_CLASS_PHYSICAL = 5,
LIBUSB_CLASS_PTP = 6,
LIBUSB_CLASS_IMAGE = 6,
LIBUSB_CLASS_PRINTER = 7,
@@ -178,6 +179,21 @@ enum libusb_bos_type {
LIBUSB_BT_CONTAINER_ID = 4,
};
+enum libusb_capability {
+ /* libusb supports libusb_has_capability(). */
+ LIBUSB_CAP_HAS_CAPABILITY = 0,
+ /* Hotplug support is available. */
+ LIBUSB_CAP_HAS_HOTPLUG,
+ /* Can access HID devices without requiring user intervention. */
+ LIBUSB_CAP_HAS_HID_ACCESS,
+
+ /*
+* Supports detaching of the default USB driver with
+* libusb_detach_kernel_driver().
+*/
+ LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER,
+};
+
enum libusb_error {
LIBUSB_SUCCESS = 0,
LIBUSB_ERROR_IO = -1,
@@ -450,6 +466,7 @@ const char *libusb_strerror(int code);
const char *libusb_error_name(int code);
intlibusb_init(libusb_context ** context);
void libusb_exit(struct libusb_context *ctx);
+intlibusb_has_capability(uint32_t capability);
/* Device handling and enumeration */
Modified: stable/12/lib/libusb/libusb10.c
==
--- stable/12/lib/libusb/libusb10.c Tue Jun 16
svn commit: r362224 - in stable: 10/lib/libusb 11/lib/libusb 12/lib/libusb 9/lib/libusb
Author: kevans
Date: Tue Jun 16 12:21:55 2020
New Revision: 362224
URL: https://svnweb.freebsd.org/changeset/base/362224
Log:
MFC r361977: libusb: improve compatibility
Specifically, add LIBUSB_CLASS_PHYSICAL and the libusb_has_capability API.
Descriptions and functionality for these derived from the
documentation at [0]. The current set of capabilities are all supported by
libusb.
These were detected as missing after updating net/freerdp to 2.1.1, which
attempted to use both.
[0] http://libusb.sourceforge.net/api-1.0/group__libusb__misc.html
Modified:
stable/11/lib/libusb/Makefile
stable/11/lib/libusb/libusb.3
stable/11/lib/libusb/libusb.h
stable/11/lib/libusb/libusb10.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/lib/libusb/Makefile
stable/10/lib/libusb/libusb.3
stable/10/lib/libusb/libusb.h
stable/10/lib/libusb/libusb10.c
stable/12/lib/libusb/Makefile
stable/12/lib/libusb/libusb.3
stable/12/lib/libusb/libusb.h
stable/12/lib/libusb/libusb10.c
stable/9/lib/libusb/Makefile
stable/9/lib/libusb/libusb.3
stable/9/lib/libusb/libusb.h
stable/9/lib/libusb/libusb10.c
Directory Properties:
stable/10/ (props changed)
stable/12/ (props changed)
stable/9/ (props changed)
stable/9/lib/ (props changed)
stable/9/lib/libusb/ (props changed)
Modified: stable/11/lib/libusb/Makefile
==
--- stable/11/lib/libusb/Makefile Tue Jun 16 12:16:35 2020
(r362223)
+++ stable/11/lib/libusb/Makefile Tue Jun 16 12:21:55 2020
(r362224)
@@ -69,6 +69,7 @@ CFLAGS+= -I ../../sys
MLINKS += libusb.3 libusb_get_version.3
MLINKS += libusb.3 libusb_init.3
MLINKS += libusb.3 libusb_exit.3
+MLINKS += libusb.3 libusb_has_capability.3
MLINKS += libusb.3 libusb_strerror.3
MLINKS += libusb.3 libusb_error_name.3
MLINKS += libusb.3 libusb_set_debug.3
Modified: stable/11/lib/libusb/libusb.3
==
--- stable/11/lib/libusb/libusb.3 Tue Jun 16 12:16:35 2020
(r362223)
+++ stable/11/lib/libusb/libusb.3 Tue Jun 16 12:21:55 2020
(r362224)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 23, 2016
+.Dd June 16, 2020
.Dt LIBUSB 3
.Os
.Sh NAME
@@ -60,6 +60,33 @@ failure.
Deinitialise libusb.
Must be called at the end of the application.
Other libusb routines may not be called after this function.
+.Pp
+.Ft int
+.Fn libusb_has_capability "uint32_t capability"
+This function checks the runtime capabilities of
+.Nm .
+This function will return non-zero if the given
+.Fa capability
+is supported, 0 if it is not supported.
+The valid values for
+.Fa capability
+are:
+.Bl -tag -width LIBUSB_CAP -offset indent
+.It Va LIBUSB_CAP_HAS_CAPABILITY
+.Nm
+supports
+.Fn libusb_has_capability .
+.It Va LIBUSB_CAP_HAS_HOTPLUG
+.Nm
+supports hotplug notifications.
+.It Va LIBUSB_CAP_HAS_HID_ACCESS
+.Nm
+can access HID devices without requiring user intervention.
+.It Va LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER
+.Nm
+supports detaching of the default USB driver with
+.Fn libusb_detach_kernel_driver .
+.El
.Pp
.Ft const char *
.Fn libusb_strerror "int code"
Modified: stable/11/lib/libusb/libusb.h
==
--- stable/11/lib/libusb/libusb.h Tue Jun 16 12:16:35 2020
(r362223)
+++ stable/11/lib/libusb/libusb.h Tue Jun 16 12:21:55 2020
(r362224)
@@ -52,6 +52,7 @@ enum libusb_class_code {
LIBUSB_CLASS_AUDIO = 1,
LIBUSB_CLASS_COMM = 2,
LIBUSB_CLASS_HID = 3,
+ LIBUSB_CLASS_PHYSICAL = 5,
LIBUSB_CLASS_PTP = 6,
LIBUSB_CLASS_IMAGE = 6,
LIBUSB_CLASS_PRINTER = 7,
@@ -176,6 +177,21 @@ enum libusb_bos_type {
LIBUSB_BT_CONTAINER_ID = 4,
};
+enum libusb_capability {
+ /* libusb supports libusb_has_capability(). */
+ LIBUSB_CAP_HAS_CAPABILITY = 0,
+ /* Hotplug support is available. */
+ LIBUSB_CAP_HAS_HOTPLUG,
+ /* Can access HID devices without requiring user intervention. */
+ LIBUSB_CAP_HAS_HID_ACCESS,
+
+ /*
+* Supports detaching of the default USB driver with
+* libusb_detach_kernel_driver().
+*/
+ LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER,
+};
+
enum libusb_error {
LIBUSB_SUCCESS = 0,
LIBUSB_ERROR_IO = -1,
@@ -448,6 +464,7 @@ const char *libusb_strerror(int code);
const char *libusb_error_name(int code);
intlibusb_init(libusb_context ** context);
void libusb_exit(struct libusb_context *ctx);
+intlibusb_has_capability(uint32_t capability);
/* Device handling and enumeration */
Modified: stable/11/lib/libusb/libusb10.c
==
--- stable/11/lib/libusb/libusb10.c Tue Jun 16
svn commit: r362224 - in stable: 10/lib/libusb 11/lib/libusb 12/lib/libusb 9/lib/libusb
Author: kevans
Date: Tue Jun 16 12:21:55 2020
New Revision: 362224
URL: https://svnweb.freebsd.org/changeset/base/362224
Log:
MFC r361977: libusb: improve compatibility
Specifically, add LIBUSB_CLASS_PHYSICAL and the libusb_has_capability API.
Descriptions and functionality for these derived from the
documentation at [0]. The current set of capabilities are all supported by
libusb.
These were detected as missing after updating net/freerdp to 2.1.1, which
attempted to use both.
[0] http://libusb.sourceforge.net/api-1.0/group__libusb__misc.html
Modified:
stable/10/lib/libusb/Makefile
stable/10/lib/libusb/libusb.3
stable/10/lib/libusb/libusb.h
stable/10/lib/libusb/libusb10.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/lib/libusb/Makefile
stable/11/lib/libusb/libusb.3
stable/11/lib/libusb/libusb.h
stable/11/lib/libusb/libusb10.c
stable/12/lib/libusb/Makefile
stable/12/lib/libusb/libusb.3
stable/12/lib/libusb/libusb.h
stable/12/lib/libusb/libusb10.c
stable/9/lib/libusb/Makefile
stable/9/lib/libusb/libusb.3
stable/9/lib/libusb/libusb.h
stable/9/lib/libusb/libusb10.c
Directory Properties:
stable/11/ (props changed)
stable/12/ (props changed)
stable/9/ (props changed)
stable/9/lib/ (props changed)
stable/9/lib/libusb/ (props changed)
Modified: stable/10/lib/libusb/Makefile
==
--- stable/10/lib/libusb/Makefile Tue Jun 16 12:16:35 2020
(r362223)
+++ stable/10/lib/libusb/Makefile Tue Jun 16 12:21:55 2020
(r362224)
@@ -71,6 +71,7 @@ CFLAGS+= -I ../../sys
MLINKS += libusb.3 libusb_get_version.3
MLINKS += libusb.3 libusb_init.3
MLINKS += libusb.3 libusb_exit.3
+MLINKS += libusb.3 libusb_has_capability.3
MLINKS += libusb.3 libusb_strerror.3
MLINKS += libusb.3 libusb_error_name.3
MLINKS += libusb.3 libusb_set_debug.3
Modified: stable/10/lib/libusb/libusb.3
==
--- stable/10/lib/libusb/libusb.3 Tue Jun 16 12:16:35 2020
(r362223)
+++ stable/10/lib/libusb/libusb.3 Tue Jun 16 12:21:55 2020
(r362224)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 23, 2016
+.Dd June 16, 2020
.Dt LIBUSB 3
.Os
.Sh NAME
@@ -60,6 +60,33 @@ failure.
Deinitialise libusb.
Must be called at the end of the application.
Other libusb routines may not be called after this function.
+.Pp
+.Ft int
+.Fn libusb_has_capability "uint32_t capability"
+This function checks the runtime capabilities of
+.Nm .
+This function will return non-zero if the given
+.Fa capability
+is supported, 0 if it is not supported.
+The valid values for
+.Fa capability
+are:
+.Bl -tag -width LIBUSB_CAP -offset indent
+.It Va LIBUSB_CAP_HAS_CAPABILITY
+.Nm
+supports
+.Fn libusb_has_capability .
+.It Va LIBUSB_CAP_HAS_HOTPLUG
+.Nm
+supports hotplug notifications.
+.It Va LIBUSB_CAP_HAS_HID_ACCESS
+.Nm
+can access HID devices without requiring user intervention.
+.It Va LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER
+.Nm
+supports detaching of the default USB driver with
+.Fn libusb_detach_kernel_driver .
+.El
.Pp
.Ft const char *
.Fn libusb_strerror "int code"
Modified: stable/10/lib/libusb/libusb.h
==
--- stable/10/lib/libusb/libusb.h Tue Jun 16 12:16:35 2020
(r362223)
+++ stable/10/lib/libusb/libusb.h Tue Jun 16 12:21:55 2020
(r362224)
@@ -52,6 +52,7 @@ enum libusb_class_code {
LIBUSB_CLASS_AUDIO = 1,
LIBUSB_CLASS_COMM = 2,
LIBUSB_CLASS_HID = 3,
+ LIBUSB_CLASS_PHYSICAL = 5,
LIBUSB_CLASS_PTP = 6,
LIBUSB_CLASS_IMAGE = 6,
LIBUSB_CLASS_PRINTER = 7,
@@ -176,6 +177,21 @@ enum libusb_bos_type {
LIBUSB_BT_CONTAINER_ID = 4,
};
+enum libusb_capability {
+ /* libusb supports libusb_has_capability(). */
+ LIBUSB_CAP_HAS_CAPABILITY = 0,
+ /* Hotplug support is available. */
+ LIBUSB_CAP_HAS_HOTPLUG,
+ /* Can access HID devices without requiring user intervention. */
+ LIBUSB_CAP_HAS_HID_ACCESS,
+
+ /*
+* Supports detaching of the default USB driver with
+* libusb_detach_kernel_driver().
+*/
+ LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER,
+};
+
enum libusb_error {
LIBUSB_SUCCESS = 0,
LIBUSB_ERROR_IO = -1,
@@ -447,6 +463,7 @@ const char *libusb_strerror(int code);
const char *libusb_error_name(int code);
intlibusb_init(libusb_context ** context);
void libusb_exit(struct libusb_context *ctx);
+intlibusb_has_capability(uint32_t capability);
/* Device handling and enumeration */
Modified: stable/10/lib/libusb/libusb10.c
==
--- stable/10/lib/libusb/libusb10.c Tue Jun 16
svn commit: r362223 - stable/11/release/doc/share/xml
Author: gjb Date: Tue Jun 16 12:16:35 2020 New Revision: 362223 URL: https://svnweb.freebsd.org/changeset/base/362223 Log: Fix version number entities. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: stable/11/release/doc/share/xml/release.ent Modified: stable/11/release/doc/share/xml/release.ent == --- stable/11/release/doc/share/xml/release.ent Tue Jun 16 12:12:55 2020 (r36) +++ stable/11/release/doc/share/xml/release.ent Tue Jun 16 12:16:35 2020 (r362223) @@ -6,7 +6,7 @@ - + - - + + ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362222 - stable/11/release/doc/en_US.ISO8859-1/errata
Author: gjb Date: Tue Jun 16 12:12:55 2020 New Revision: 36 URL: https://svnweb.freebsd.org/changeset/base/36 Log: Add a note about a typo in a version number in the 11.4 release notes. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: stable/11/release/doc/en_US.ISO8859-1/errata/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/errata/article.xml == --- stable/11/release/doc/en_US.ISO8859-1/errata/article.xmlTue Jun 16 12:10:18 2020(r362221) +++ stable/11/release/doc/en_US.ISO8859-1/errata/article.xmlTue Jun 16 12:12:55 2020(r36) @@ -112,6 +112,14 @@ xlink:href="https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246274;>PR 246274 for additional details. + + + [2020-06-16] The 11.4 release notes + erroneously state the KDE + desktop environment has been updated to version + 5.8.4.1.19.12.3. The correct version is + 5.18.4.1.19.12.3. + ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362221 - stable/11/release/doc/en_US.ISO8859-1/errata
Author: gjb Date: Tue Jun 16 12:10:18 2020 New Revision: 362221 URL: https://svnweb.freebsd.org/changeset/base/362221 Log: Wrap long lines. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: stable/11/release/doc/en_US.ISO8859-1/errata/article.xml Modified: stable/11/release/doc/en_US.ISO8859-1/errata/article.xml == --- stable/11/release/doc/en_US.ISO8859-1/errata/article.xmlTue Jun 16 08:59:44 2020(r362220) +++ stable/11/release/doc/en_US.ISO8859-1/errata/article.xmlTue Jun 16 12:10:18 2020(r362221) @@ -96,15 +96,16 @@ - [2020-06-11] Source-based upgrades from 11.2 on the - architecture may fail to compile + [2020-06-11] Source-based upgrades from 11.2 + on the architecture may fail to compile clang due to the amount of RAM consumed. Adding CFLAGS+=-O1 to /etc/make.conf or /etc/src.conf has been observed to work - around the compile-time RAM exhaustion. + around the compile-time RAM + exhaustion. See https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362220 - in head/contrib/opencsd: . decoder/build decoder/docs decoder/tests
Author: andrew Date: Tue Jun 16 08:59:44 2020 New Revision: 362220 URL: https://svnweb.freebsd.org/changeset/base/362220 Log: Re-add opencsd as a vendor import from the dist directory Sponsored by: Innovate UK Added: head/contrib/opencsd/ - copied from r353392, vendor/opencsd/dist/ Deleted: head/contrib/opencsd/.gitignore head/contrib/opencsd/HOWTO.md head/contrib/opencsd/LICENSE head/contrib/opencsd/README.md head/contrib/opencsd/TODO head/contrib/opencsd/decoder/build/ head/contrib/opencsd/decoder/docs/ head/contrib/opencsd/decoder/tests/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362219 - head/contrib/opencsd
Author: andrew Date: Tue Jun 16 08:57:13 2020 New Revision: 362219 URL: https://svnweb.freebsd.org/changeset/base/362219 Log: Remove opencsd so I can re-import it with the correct ancestry Sponsored by: Innovate UK Deleted: head/contrib/opencsd/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362218 - head/stand/common
Author: tsoome
Date: Tue Jun 16 07:30:34 2020
New Revision: 362218
URL: https://svnweb.freebsd.org/changeset/base/362218
Log:
loader: zfs_cmd.c does not really compile without libzfs.h
Having libzfs.h wrapped in LOADER_ZFS_SUPPORT check does not really make
sense,
because we do need function declarations with C99.
Sponsored by: Netflix, Klara Inc.
Modified:
head/stand/common/zfs_cmd.c
Modified: head/stand/common/zfs_cmd.c
==
--- head/stand/common/zfs_cmd.c Tue Jun 16 07:05:03 2020(r362217)
+++ head/stand/common/zfs_cmd.c Tue Jun 16 07:30:34 2020(r362218)
@@ -37,10 +37,7 @@ __FBSDID("$FreeBSD$");
#include
#include "bootstrap.h"
-
-#ifdef LOADER_ZFS_SUPPORT
#include "libzfs.h"
-#endif
COMMAND_SET(lszfs, "lszfs", "list child datasets of a zfs dataset",
command_lszfs);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r362217 - head/stand/common
Author: tsoome
Date: Tue Jun 16 07:05:03 2020
New Revision: 362217
URL: https://svnweb.freebsd.org/changeset/base/362217
Log:
loader: variable i is unused without MBR/GPT support built in
Because i is only used as index in for loop, declare it in for statement.
Sponsored by: Netflix, Klara Inc.
Modified:
head/stand/common/part.c
Modified: head/stand/common/part.c
==
--- head/stand/common/part.cTue Jun 16 04:17:08 2020(r362216)
+++ head/stand/common/part.cTue Jun 16 07:05:03 2020(r362217)
@@ -647,7 +647,6 @@ ptable_open(void *dev, uint64_t sectors, uint16_t sect
struct dos_partition *dp;
struct ptable *table;
uint8_t *buf;
- int i;
#ifdef LOADER_MBR_SUPPORT
struct pentry *entry;
uint32_t start, end;
@@ -720,7 +719,7 @@ ptable_open(void *dev, uint64_t sectors, uint16_t sect
* start sector 1. After DOSPTYP_PMBR, there may be other partitions.
* UEFI compliant PMBR has no other partitions.
*/
- for (i = 0; i < NDOSPART; i++) {
+ for (int i = 0; i < NDOSPART; i++) {
if (dp[i].dp_flag != 0 && dp[i].dp_flag != 0x80) {
DPRINTF("invalid partition flag %x", dp[i].dp_flag);
goto out;
@@ -742,7 +741,7 @@ ptable_open(void *dev, uint64_t sectors, uint16_t sect
/* Read MBR. */
DPRINTF("MBR detected");
table->type = PTABLE_MBR;
- for (i = has_ext = 0; i < NDOSPART; i++) {
+ for (int i = has_ext = 0; i < NDOSPART; i++) {
if (dp[i].dp_typ == 0)
continue;
start = le32dec(&(dp[i].dp_start));
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r362211 - head/sbin/ifconfig
On 6/16/20 2:28 AM, Adrian Chadd wrote: > Author: adrian > Date: Tue Jun 16 00:28:08 2020 > New Revision: 362211 > URL: https://svnweb.freebsd.org/changeset/base/362211 > > Log: > [net80211] Add uapsd option to ifconfig > > Add an enable/disable option for controlling uapsd. I'm not yet controlling > the individual AC configs or the service period. > > Modified: > head/sbin/ifconfig/ifieee80211.c > > Modified: head/sbin/ifconfig/ifieee80211.c > == Should we document it now, or wait a while to see it is here to stay? Cheers, Mateusz ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
