re: CVS commit: src/usr.bin/rsh
David A. Holland writes: Module Name: src Committed By: dholland Date: Thu Oct 30 06:13:50 UTC 2014 Modified Files: src/usr.bin/rsh: rsh.c Log Message: Drop setuid before execing rlogin. Failure to do so should be harmless, but is sloppy. as jnemeth reminded me, this code does not run set-id, so this change seems useless. .mrg.
Re: CVS commit: src/usr.bin/rsh
On Oct 30, 6:13am, David A. Holland wrote: } } Module Name: src } Committed By: dholland } Date: Thu Oct 30 06:13:50 UTC 2014 } } Modified Files: } src/usr.bin/rsh: rsh.c } } Log Message: } Drop setuid before execing rlogin. Failure to do so should be } harmless, but is sloppy. Uh... -r-xr-xr-x 1 root wheel 16303 Sep 18 17:35 /usr/bin/rsh* BTW: NetBSD server 6.1_STABLE NetBSD 6.1_STABLE (JNGATE) #1: Sat Oct 4 06:30:12 PDT 2014 root@:/sys/arch/amd64/compile/JNGATE amd64 }-- End of excerpt from David A. Holland
Re: CVS commit: src/usr.bin/config
On Thu, 30 Oct 2014, Masao Uebayashi wrote: What do you expect by doing: options FOO no options FOO options FOO I expect it to be equivalent to just one options FOO. The no options FOO in line 2 should cancel the options FOO in line 1, and then the options FOO in line 3 should put it back. In the cases that I care about, the options and no options lines will be in different files, referenced via include directives. --apb (Alan Barrett)
Re: CVS commit: src/usr.bin/config
On 10/30/14 10:36, Christos Zoulas wrote: Module Name:src Committed By: christos Date: Thu Oct 30 01:36:13 UTC 2014 Modified Files: src/usr.bin/config: mkheaders.c Log Message: print more info about the overflow It panics on amd64 when negative value is specified like RTC_OFFSET=-540. /build/head/obj.amd64/tooldir.NetBSD-7.99.1-amd64/bin/nbconfig: panic: overflow -540 = 0xfde4 Thanks, -- t-hash
Re: CVS commit: src/usr.bin/config
On Thu, Oct 30, 2014 at 8:36 PM, Alan Barrett a...@netbsd.org wrote: On Thu, 30 Oct 2014, Masao Uebayashi wrote: What do you expect by doing: options FOO no options FOO options FOO I expect it to be equivalent to just one options FOO. The no options FOO in line 2 should cancel the options FOO in line 1, and then the options FOO in line 3 should put it back. In the cases that I care about, the options and no options lines will be in different files, referenced via include directives. So, while you expect that options works before it's defined, you also expect the order is honored for no use. I'm not sure how it can work internally. At this moment, no are evaluated when it's parsed. Those no agp* fallouts happened because agp is re-selected while resolving dependency after all parsing is done. IMO anything relying on order tends to be broken by design. For example: if BAR depends on FOO, no options FOO has to disable BAR too, because BAR can't be enabled without FOO. But when you re-enable FOO, BAR is not enabled. Is this really what you're expecting?
Re: CVS commit: src/usr.bin/config
On Thu, Oct 30, 2014 at 09:27:06PM +0900, Masao Uebayashi wrote: On Thu, Oct 30, 2014 at 8:36 PM, Alan Barrett a...@netbsd.org wrote: On Thu, 30 Oct 2014, Masao Uebayashi wrote: What do you expect by doing: options FOO no options FOO options FOO I expect it to be equivalent to just one options FOO. The no options FOO in line 2 should cancel the options FOO in line 1, and then the options FOO in line 3 should put it back. In the cases that I care about, the options and no options lines will be in different files, referenced via include directives. So, while you expect that options works before it's defined, you also expect the order is honored for no use. I'm not sure how it can work internally. At this moment, no are evaluated when it's parsed. Those no agp* fallouts happened because agp is re-selected while resolving dependency after all parsing is done. IMO anything relying on order tends to be broken by design. For example: if BAR depends on FOO, no options FOO has to disable BAR too, because BAR can't be enabled without FOO. But when you re-enable FOO, BAR is not enabled. Is this really what you're expecting? I don't know how it is right now, but options didn't use to depend on other options so with options the case is moot and I would expect the behaviour Alan describes as correct (this is how it worked the last time I touched config(1), or at least, was meant to work). For devices, I spent quite a bit of effort making sure no behaved the way Alan expects it. For instance: include GENERIC this* at pci? dev ? fun ? no device pci that* at pci? dev ? fun ? would emit an error for that* but not for this*. Moreover, without the last line, none of this* or anything pci-related in GENERIC would actually be selected. So if you start making defopt more equivalent to define and allow options BAR to depend on options FOO, then I would expect no options FOO to cancel a previous options BAR. Otherwise defopt and define used to have very different semantics. -- Quentin Garnier - c...@cubidou.net See the look on my face from staying too long in one place [...] every time the morning breaks I know I'm closer to falling KT Tunstall, Saving My Face, Drastic Fantastic, 2007. pgpH8ruph4GRz.pgp Description: PGP signature
Re: CVS commit: src/usr.bin/config
In article 54522b88.7060...@gmail.com, Takahiro HAYASHI t.hash...@gmail.com wrote: On 10/30/14 10:36, Christos Zoulas wrote: Module Name: src Committed By:christos Date:Thu Oct 30 01:36:13 UTC 2014 Modified Files: src/usr.bin/config: mkheaders.c Log Message: print more info about the overflow It panics on amd64 when negative value is specified like RTC_OFFSET=-540. /build/head/obj.amd64/tooldir.NetBSD-7.99.1-amd64/bin/nbconfig: panic: overflow -540 = 0xfde4 Fixed, thanks! christos
Re: CVS commit: src/usr.bin/config
On Thu, Oct 30, 2014 at 11:14:50AM +0900, Masao Uebayashi wrote: On Thu, Oct 30, 2014 at 10:51 AM, Christos Zoulas chris...@astron.com wrote: In article 20141030012621.0982...@cvs.netbsd.org, Masao Uebayashi source-changes-d@NetBSD.org wrote: Re: constructors/destructors: Using them will create a portability constraint on elf. This has the implication that rump will not work on some platforms. Could you show me an example failure senario? What do you propose instead? I heard that rump fixed linkset problem using .ctors/.dtors. I heard something different. A toolchain problem was fixed by using __attribute__((constructor)) to reach the contents of link sets in userspace dynamically linked environments where generating __start/__stop was not possible. Regular link sets are still preferred, as they require less magic from the runtime. Is there a problem rototilling config is going to solve over what is possible with the existing mechanism (*)? The problem TODO lists is random ELF sections (with potentially long names) in the final kernel. Is that a problem? *) you probably also heard that rump kernels have constructors with priority levels, implemented using link sets
Re: CVS commit: src/usr.bin/rsh
On Wed, Oct 29, 2014 at 11:54:41PM -0700, John Nemeth wrote: On Oct 30, 6:13am, David A. Holland wrote: } } Module Name: src } Committed By: dholland } Date: Thu Oct 30 06:13:50 UTC 2014 } } Modified Files: }src/usr.bin/rsh: rsh.c } } Log Message: } Drop setuid before execing rlogin. Failure to do so should be } harmless, but is sloppy. Uh... -r-xr-xr-x 1 root wheel 16303 Sep 18 17:35 /usr/bin/rsh* -r-sr-xr-x 1 root wheel 16169 Sep 11 04:45 /bin/rcmd It doesn't *work* if not setuid. -- David A. Holland dholl...@netbsd.org
Re: CVS commit: src/usr.bin/rsh
On Thu, Oct 30, 2014 at 04:40:57PM +, David Holland wrote: } } Module Name:src } Committed By: dholland } Date: Thu Oct 30 06:13:50 UTC 2014 } } Modified Files: } src/usr.bin/rsh: rsh.c } } Log Message: } Drop setuid before execing rlogin. Failure to do so should be } harmless, but is sloppy. Uh... -r-xr-xr-x 1 root wheel 16303 Sep 18 17:35 /usr/bin/rsh* -r-sr-xr-x 1 root wheel 16169 Sep 11 04:45 /bin/rcmd It doesn't *work* if not setuid. Although I suppose that code is outside IN_RCMD. So maybe it's useless; but on the other hand, what are the odds of someone taking the code and installing it the traditional way? Plus I'm sure the Coverity report that triggered this discussion in the first place thought the code was running setuid. -- David A. Holland dholl...@netbsd.org
Re: CVS commit: src/usr.bin/config
On Thu, Oct 30, 2014 at 09:27:06PM +0900, Masao Uebayashi wrote: So, while you expect that options works before it's defined, you also expect the order is honored for no use. I'm not sure how it can work internally. At this moment, no are evaluated when it's parsed. Those no agp* fallouts happened because agp is re-selected while resolving dependency after all parsing is done. IMO anything relying on order tends to be broken by design. For example: if BAR depends on FOO, no options FOO has to disable BAR too, because BAR can't be enabled without FOO. But when you re-enable FOO, BAR is not enabled. Is this really what you're expecting? I think it's important not to break the semantics of this. -- David A. Holland dholl...@netbsd.org
Re: CVS commit: src/usr.bin/config
On Thu, Oct 30, 2014 at 10:01 PM, Quentin Garnier c...@cubidou.net wrote: On Thu, Oct 30, 2014 at 09:27:06PM +0900, Masao Uebayashi wrote: On Thu, Oct 30, 2014 at 8:36 PM, Alan Barrett a...@netbsd.org wrote: On Thu, 30 Oct 2014, Masao Uebayashi wrote: What do you expect by doing: options FOO no options FOO options FOO I expect it to be equivalent to just one options FOO. The no options FOO in line 2 should cancel the options FOO in line 1, and then the options FOO in line 3 should put it back. In the cases that I care about, the options and no options lines will be in different files, referenced via include directives. So, while you expect that options works before it's defined, you also expect the order is honored for no use. I'm not sure how it can work internally. At this moment, no are evaluated when it's parsed. Those no agp* fallouts happened because agp is re-selected while resolving dependency after all parsing is done. IMO anything relying on order tends to be broken by design. For example: if BAR depends on FOO, no options FOO has to disable BAR too, because BAR can't be enabled without FOO. But when you re-enable FOO, BAR is not enabled. Is this really what you're expecting? I don't know how it is right now, but options didn't use to depend on other options so with options the case is moot and I would expect the behaviour Alan describes as correct (this is how it worked the last time I touched config(1), or at least, was meant to work). OK, my example was confusing, I meant module (attribute-as-module) by options FOO. Because config(1) has had no way to directly select a module, I abused/extended options to select a module. I'm reverting it and adding a generic select directive which selects a specified module and its dependency modules. For options, you're right, options (flags/params) don't have dependency. I don't mean to extend it too. I try to address apb@'s item. For devices, I spent quite a bit of effort making sure no behaved the way Alan expects it. For instance: include GENERIC this* at pci? dev ? fun ? no device pci that* at pci? dev ? fun ? would emit an error for that* but not for this*. Moreover, without the last line, none of this* or anything pci-related in GENERIC would actually be selected. I don't fully understand the device part (especially no behavior), but I assume they basically expect things are already defined, right? So if you start making defopt more equivalent to define and allow options BAR to depend on options FOO, then I would expect no options FOO to cancel a previous options BAR. Otherwise defopt and define used to have very different semantics. I don't mean to make defopt (flags/params) to be like define. (Said so in TODO.) I mean to make device (and hopefully attach) to be more like define though.
Re: CVS commit: src/usr.bin/config
On Fri, Oct 31, 2014 at 1:33 AM, Antti Kantee po...@homeworld.netbsd.org wrote: On Thu, Oct 30, 2014 at 11:14:50AM +0900, Masao Uebayashi wrote: On Thu, Oct 30, 2014 at 10:51 AM, Christos Zoulas chris...@astron.com wrote: In article 20141030012621.0982...@cvs.netbsd.org, Masao Uebayashi source-changes-d@NetBSD.org wrote: Re: constructors/destructors: Using them will create a portability constraint on elf. This has the implication that rump will not work on some platforms. Could you show me an example failure senario? What do you propose instead? I heard that rump fixed linkset problem using .ctors/.dtors. I heard something different. A toolchain problem was fixed by using __attribute__((constructor)) to reach the contents of link sets in userspace dynamically linked environments where generating __start/__stop was not possible. Regular link sets are still preferred, as they require less magic from the runtime. OK. Is there a problem rototilling config is going to solve over what is possible with the existing mechanism (*)? You're welcomed to fix any problems without rotorill and/or breakage. The problem TODO lists is random ELF sections (with potentially long names) in the final kernel. Is that a problem? I may misremember it but was it Mach-O specific? The long name part may be irrelevant. But I still *feel* linkset should be done in a better way. I'll revisit this when I will look closer at moduler vs. sysctl. *) you probably also heard that rump kernels have constructors with priority levels, implemented using link sets Do you hardcode the priority?
Re: CVS commit: src/usr.bin/config
On 30/10/14 17:28, Masao Uebayashi wrote: Is there a problem rototilling config is going to solve over what is possible with the existing mechanism (*)? You're welcomed to fix any problems without rotorill and/or breakage. You're not answering the question. *) you probably also heard that rump kernels have constructors with priority levels, implemented using link sets Do you hardcode the priority? Yes. They are easy to hardcode, as you can observe from working code, and I don't see the need for a complex mechanism. There's really only ~10, and even less for the full kernel, since you don't need to worry about things like will vfs be present or when do i configure the address for lo0. Even if you'd want to worry about for example the latter one, how would you express it with config? But let's consider some magic values are generated by config in a fashion which works in a non-monolithic build. How will anything be different if you touch or don't touch linksets, i.e. how is your question relevant in this discussion? Cleaning up init_main() is an ambitious project. I don't know if config is the right tool for that (I don't know it's _not_, either). I do know that it's complete orthogonal to how linksets are implemented.
Re: CVS commit: src/usr.bin/config
On Fri, Oct 31, 2014 at 2:28 AM, Masao Uebayashi uebay...@gmail.com wrote: On Fri, Oct 31, 2014 at 1:33 AM, Antti Kantee po...@homeworld.netbsd.org wrote: On Thu, Oct 30, 2014 at 11:14:50AM +0900, Masao Uebayashi wrote: On Thu, Oct 30, 2014 at 10:51 AM, Christos Zoulas chris...@astron.com wrote: In article 20141030012621.0982...@cvs.netbsd.org, Masao Uebayashi source-changes-d@NetBSD.org wrote: Re: constructors/destructors: Using them will create a portability constraint on elf. This has the implication that rump will not work on some platforms. Could you show me an example failure senario? What do you propose instead? I heard that rump fixed linkset problem using .ctors/.dtors. I heard something different. A toolchain problem was fixed by using __attribute__((constructor)) to reach the contents of link sets in userspace dynamically linked environments where generating __start/__stop was not possible. Regular link sets are still preferred, as they require less magic from the runtime. OK. Is there a problem rototilling config is going to solve over what is possible with the existing mechanism (*)? You're welcomed to fix any problems without rotorill and/or breakage. The problem TODO lists is random ELF sections (with potentially long names) in the final kernel. Is that a problem? I may misremember it but was it Mach-O specific? The long name part may be irrelevant. But I still *feel* linkset should be done in a better way. I'll revisit this when I will look closer at moduler vs. sysctl. pooka@ is always far ahead already fixed modular-vs-sysctl problems. Now my complaint about linkset is that it doesn't properly put linkset sections under .text/.data/.bss, etc. I also want to utilize linker script in general, as said in TODO.
Re: CVS commit: src/usr.bin/config
On Fri, Oct 31, 2014 at 3:00 AM, Antti Kantee po...@netbsd.org wrote: On 30/10/14 17:28, Masao Uebayashi wrote: Is there a problem rototilling config is going to solve over what is possible with the existing mechanism (*)? You're welcomed to fix any problems without rotorill and/or breakage. You're not answering the question. For one, to localize related objects (*.o). Now config(1) just collects all *.o and link them into netbsd. I want to collect for example machdep related objects to be located in the lower address. There might be a way to achieve this without touching config(1). But I think reusing information in config(1) definitions is the most straightforward. (I'll try to state this more clearly in TODO.) *) you probably also heard that rump kernels have constructors with priority levels, implemented using link sets Do you hardcode the priority? Yes. They are easy to hardcode, as you can observe from working code, and I don't see the need for a complex mechanism. There's really only ~10, and even less for the full kernel, since you don't need to worry about things like will vfs be present or when do i configure the address for lo0. Even if you'd want to worry about for example the latter one, how would you express it with config? The latter is impossible. Module dependency is only about init code order. But let's consider some magic values are generated by config in a fashion which works in a non-monolithic build. How will anything be different if you touch or don't touch linksets, i.e. how is your question relevant in this discussion? Cleaning up init_main() is an ambitious project. I don't know if config is the right tool for that (I don't know it's _not_, either). I do know that it's complete orthogonal to how linksets are implemented. I'm discussing multiple things and confusing contexts. My question about linkset is more like: using linker is good, but why should it be linkset?. I don't understand why their sections are not under .text/.data/.bss. I don't get why their section names have to be exposed in the resulting netbsd. In any case I'll remove linkset part from TODO to not confuse people.
Re: CVS commit: src/usr.bin/config
On Fri, Oct 31, 2014 at 1:49 AM, David Holland dholland-sourcechan...@netbsd.org wrote: On Thu, Oct 30, 2014 at 09:27:06PM +0900, Masao Uebayashi wrote: So, while you expect that options works before it's defined, you also expect the order is honored for no use. I'm not sure how it can work internally. At this moment, no are evaluated when it's parsed. Those no agp* fallouts happened because agp is re-selected while resolving dependency after all parsing is done. IMO anything relying on order tends to be broken by design. For example: if BAR depends on FOO, no options FOO has to disable BAR too, because BAR can't be enabled without FOO. But when you re-enable FOO, BAR is not enabled. Is this really what you're expecting? I think it's important not to break the semantics of this. Sure, but this makes me rather depressive.
Re: CVS commit: src/usr.bin/config
Date: Fri, 31 Oct 2014 03:36:45 +0900 From: Masao Uebayashi uebay...@gmail.com On Fri, Oct 31, 2014 at 1:49 AM, David Holland dholland-sourcechan...@netbsd.org wrote: On Thu, Oct 30, 2014 at 09:27:06PM +0900, Masao Uebayashi wrote: At this moment, no are evaluated when it's parsed. Those no agp* fallouts happened because agp is re-selected while resolving dependency after all parsing is done. IMO anything relying on order tends to be broken by design. For example: if BAR depends on FOO, no options FOO has to disable BAR too, because BAR can't be enabled without FOO. But when you re-enable FOO, BAR is not enabled. Is this really what you're expecting? I think it's important not to break the semantics of this. Sure, but this makes me rather depressive. It seems to me that while depending on ordering for definitions, files, c., may be no good, for selections the language of include GENERIC no options DIAGNOSTIC no agp* is still valuable. So config(1) ought to choose whatever is the last yes/no answer for a selection in order to decide what things are really enabled or disabled, and then process dependencies recursively from there, rather than incrementally processing dependencies as the parser makes progress. (But I've only been vaguely following from the sidelines, so feel free to disregard me if that doesn't make any sense given how config(1) works.)
Re: CVS commit: [netbsd-7] src/sys/arch/x86/x86
On Oct 30, 6:58pm, Martin Husemann wrote: } } Module Name: src } Committed By: martin } Date: Thu Oct 30 18:58:45 UTC 2014 } } Modified Files: } src/sys/arch/x86/x86 [netbsd-7]: identcpu.c } } Log Message: } Pull up following revision(s) (requested by riz in ticket #171): } sys/arch/x86/x86/identcpu.c: revision 1.46 } sys/arch/x86/x86/identcpu.c: revision 1.47 } Force x86_xsave_features to 0 when running under XEN. } This prevents the use of xsave and xrstor thus fixing } the problem in PR/49150. The basic problem is that the way AMD } implements those instructions means that information can leak } between domains so XEN treats them as privileged. As discovered by riz, and noted with 1.47, the issue isn't just restricted to AMD CPUs. Of course, riz did discover the issue with an Intel CPU on an aws instance running an ancient version of Xen, so the issue may be related to that (the ancient version of Xen). }-- End of excerpt from Martin Husemann
CVS commit: src/usr.bin/rsh
Module Name:src Committed By: dholland Date: Thu Oct 30 06:13:50 UTC 2014 Modified Files: src/usr.bin/rsh: rsh.c Log Message: Drop setuid before execing rlogin. Failure to do so should be harmless, but is sloppy. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/usr.bin/rsh/rsh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/rsh/rsh.c diff -u src/usr.bin/rsh/rsh.c:1.36 src/usr.bin/rsh/rsh.c:1.37 --- src/usr.bin/rsh/rsh.c:1.36 Sun Jun 8 02:44:15 2014 +++ src/usr.bin/rsh/rsh.c Thu Oct 30 06:13:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rsh.c,v 1.36 2014/06/08 02:44:15 enami Exp $ */ +/* $NetBSD: rsh.c,v 1.37 2014/10/30 06:13:50 dholland Exp $ */ /*- * Copyright (c) 1983, 1990, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = @(#)rsh.c 8.4 (Berkeley) 4/29/95; #else -__RCSID($NetBSD: rsh.c,v 1.36 2014/06/08 02:44:15 enami Exp $); +__RCSID($NetBSD: rsh.c,v 1.37 2014/10/30 06:13:50 dholland Exp $); #endif #endif /* not lint */ @@ -203,6 +203,7 @@ main(int argc, char **argv) #else if (asrsh) *argv = __UNCONST(rlogin); + setuid(uid); execv(_PATH_RLOGIN, argv); err(1, can't exec %s, _PATH_RLOGIN); #endif
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: martin Date: Thu Oct 30 07:53:42 UTC 2014 Modified Files: src/libexec/ld.elf_so: map_object.c Log Message: Avoid use after free, reported by the coverity scanner. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/libexec/ld.elf_so/map_object.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/map_object.c diff -u src/libexec/ld.elf_so/map_object.c:1.52 src/libexec/ld.elf_so/map_object.c:1.53 --- src/libexec/ld.elf_so/map_object.c:1.52 Sat Aug 3 13:17:05 2013 +++ src/libexec/ld.elf_so/map_object.c Thu Oct 30 07:53:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: map_object.c,v 1.52 2013/08/03 13:17:05 skrll Exp $ */ +/* $NetBSD: map_object.c,v 1.53 2014/10/30 07:53:41 martin Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -34,7 +34,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: map_object.c,v 1.52 2013/08/03 13:17:05 skrll Exp $); +__RCSID($NetBSD: map_object.c,v 1.53 2014/10/30 07:53:41 martin Exp $); #endif /* not lint */ #include errno.h @@ -442,10 +442,10 @@ _rtld_obj_free(Obj_Entry *obj) } if (!obj-phdr_loaded) xfree((void *)(uintptr_t)obj-phdr); - xfree(obj); #ifdef COMBRELOC _rtld_combreloc_reset(obj); #endif + xfree(obj); } Obj_Entry *
CVS commit: src/usr.bin/config
Module Name:src Committed By: uebayasi Date: Thu Oct 30 08:20:15 UTC 2014 Modified Files: src/usr.bin/config: TODO Log Message: config(1): More TODO To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/config/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/config/TODO diff -u src/usr.bin/config/TODO:1.5 src/usr.bin/config/TODO:1.6 --- src/usr.bin/config/TODO:1.5 Thu Oct 30 01:26:20 2014 +++ src/usr.bin/config/TODO Thu Oct 30 08:20:15 2014 @@ -109,17 +109,22 @@ o Introduce class. Accordingly device/attach selection syntax should be revisited. -o Support kernel constructor/destructor (.ctors/.dtors) +o Support kernel constructor/destructor (.kctors/.kdtors) Initialization and finalization should be called via constructors and destructors. Don't hardcode those sequences as sys/kern/init_main.c:main() does. - The order of .ctors/.dtors is resolved by dependency. The difference from + The order of .kctors/.kdtors is resolved by dependency. The difference from userland is that in kernel depended ones are located in lower addresses; machdep module is the lowest. Thus the lowest entry in .ctors must be executed the first. + The .kctors/.kdtors entries are executed by kernel's main() function, unlike + userland where start code executes .ctors/.dtors before main(). The hardcoded + sequence of various subsystem initializations in init_main.c:main() will be + replaced by an array of .kctors invocaions, and #ifdef's there will be gone. + o Replace linkset. Don't allow kernel subsystems create random ELF sections (with potentially @@ -131,3 +136,17 @@ o Replace linkset. Dynamically loaded modules have to register those entries via constructors (functions). This means that dynamically loaded modules are flexible but come with overhead. + +o Shared kernel objects. + + Since NetBSD has not established a clear kernek ABI, every single kernel + has to build all the objects by their own. As a result, similar kernels + (e.g. evbarm kernels) repeatedly compile similar objects, that is waste of + energy space. + + Share them if possible. For evb* ports, ideally everything except machdep.ko + should be shared. + + While leaving optimizations as options (CPU specific optimizations, inlined + bus_space(9) operations, etc.) for users, the official binaries build + provided by TNF should be as portable as possible.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Oct 30 08:31:27 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: gdb-7.8.1 out. To generate a diff of this commit: cvs rdiff -u -r1.1168 -r1.1169 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1168 src/doc/3RDPARTY:1.1169 --- src/doc/3RDPARTY:1.1168 Wed Oct 29 18:30:05 2014 +++ src/doc/3RDPARTY Thu Oct 30 08:31:27 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1168 2014/10/29 18:30:05 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1169 2014/10/30 08:31:27 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -425,7 +425,7 @@ Before importing a new version of extern Package: gdb Version: 7.7.1 -Current Vers: 7.7.1 +Current Vers: 7.8.1 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/gdb/ Home Page: http://www.gnu.org/software/gdb/
CVS commit: [netbsd-7] src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: martin
Date: Thu Oct 30 09:20:47 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux [netbsd-7]: sched.h
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #161):
sys/external/bsd/drm2/include/linux/sched.h: revision 1.4
Don't call kpause(9) if cold.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/external/bsd/drm2/include/linux/sched.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/sched.h
diff -u src/sys/external/bsd/drm2/include/linux/sched.h:1.3 src/sys/external/bsd/drm2/include/linux/sched.h:1.3.2.1
--- src/sys/external/bsd/drm2/include/linux/sched.h:1.3 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/include/linux/sched.h Thu Oct 30 09:20:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sched.h,v 1.3 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: sched.h,v 1.3.2.1 2014/10/30 09:20:47 martin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -51,12 +51,17 @@ schedule_timeout_uninterruptible(long ti
{
int start, end;
+ if (cold) {
+ DELAY(timeout);
+ return 0;
+ }
+
start = hardclock_ticks;
/* XXX Integer truncation...not likely to matter here. */
(void)kpause(loonix, false /*!intr*/, timeout, NULL);
end = hardclock_ticks;
- return (end - start);
+ return (end - start) 0 ? (end - start) : 0;
}
#endif /* _LINUX_SCHED_H_ */
CVS commit: [netbsd-7] src/sys/dev/pci/hdaudio
Module Name:src
Committed By: martin
Date: Thu Oct 30 10:36:52 UTC 2014
Modified Files:
src/sys/dev/pci/hdaudio [netbsd-7]: hdaudio_pci.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #162):
sys/dev/pci/hdaudio/hdaudio_pci.c: revision 1.13
disestalish interrupt and unmap register when attach failed.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/dev/pci/hdaudio/hdaudio_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/hdaudio/hdaudio_pci.c
diff -u src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.12 src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.12.4.1
--- src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.12 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/hdaudio/hdaudio_pci.c Thu Oct 30 10:36:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_pci.c,v 1.12 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: hdaudio_pci.c,v 1.12.4.1 2014/10/30 10:36:52 martin Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdaudio_pci.c,v 1.12 2014/03/29 19:28:25 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdaudio_pci.c,v 1.12.4.1 2014/10/30 10:36:52 martin Exp $);
#include sys/types.h
#include sys/param.h
@@ -162,7 +162,17 @@ hdaudio_pci_attach(device_t parent, devi
hdaudio_pci_reinit(sc);
/* Attach bus-independent HD audio layer */
- hdaudio_attach(self, sc-sc_hdaudio);
+ if (hdaudio_attach(self, sc-sc_hdaudio)) {
+ pci_intr_disestablish(sc-sc_pc, sc-sc_ih);
+ sc-sc_ih = NULL;
+ bus_space_unmap(sc-sc_hdaudio.sc_memt,
+sc-sc_hdaudio.sc_memh,
+sc-sc_hdaudio.sc_memsize);
+ sc-sc_hdaudio.sc_memvalid = false;
+ csr = pci_conf_read(sc-sc_pc, sc-sc_tag, PCI_COMMAND_STATUS_REG);
+ csr = ~(PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_BACKTOBACK_ENABLE);
+ pci_conf_write(sc-sc_pc, sc-sc_tag, PCI_COMMAND_STATUS_REG, csr);
+ }
}
static int
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: skrll
Date: Thu Oct 30 10:38:57 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: arm32_tlb.c
Log Message:
s/0/KERNEL_PID/
isb after setting TTBCR_S_PD0 as per Example B3-5 Disable non-global
mappings when changing ASID in the ARM ARM.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/arm32/arm32_tlb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/arm32_tlb.c
diff -u src/sys/arch/arm/arm32/arm32_tlb.c:1.5 src/sys/arch/arm/arm32/arm32_tlb.c:1.6
--- src/sys/arch/arm/arm32/arm32_tlb.c:1.5 Wed Oct 29 14:14:14 2014
+++ src/sys/arch/arm/arm32/arm32_tlb.c Thu Oct 30 10:38:57 2014
@@ -30,7 +30,7 @@
#include opt_multiprocessor.h
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: arm32_tlb.c,v 1.5 2014/10/29 14:14:14 skrll Exp $);
+__KERNEL_RCSID(1, $NetBSD: arm32_tlb.c,v 1.6 2014/10/30 10:38:57 skrll Exp $);
#include sys/param.h
#include sys/types.h
@@ -51,8 +51,9 @@ void
tlb_set_asid(tlb_asid_t asid)
{
arm_dsb();
- if (asid == 0) {
+ if (asid == KERNEL_PID) {
armreg_ttbcr_write(armreg_ttbcr_read() | TTBCR_S_PD0);
+ arm_isb();
}
armreg_contextidr_write(asid);
arm_isb();
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Oct 30 10:44:07 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #161 and #162 To generate a diff of this commit: cvs rdiff -u -r1.1.2.69 -r1.1.2.70 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.69 src/doc/CHANGES-7.0:1.1.2.70 --- src/doc/CHANGES-7.0:1.1.2.69 Mon Oct 27 13:43:43 2014 +++ src/doc/CHANGES-7.0 Thu Oct 30 10:44:07 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.69 2014/10/27 13:43:43 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.70 2014/10/30 10:44:07 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -1859,3 +1859,14 @@ sys/netinet6/in6.c1.177 Remove the ability for userland to toggle IN6_IFF_TENTATIVE. Preserve IN6_IFF_TENTATIVE when updating address flags. [roy, ticket #160] + +sys/external/bsd/drm2/include/linux/sched.h 1.4 + + Don't call kpause(9) if cold. + [nonaka, ticket #161] + +sys/dev/pci/hdaudio/hdaudio_pci.c 1.13 + + Disestablish interrupt and unmap register when attach failed. + [nonaka, ticket #162] +
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Thu Oct 30 10:45:17 UTC 2014 Modified Files: src/sys/arch/arm/arm32: arm32_tlb.c Log Message: Part of break-before-make is to dsb after the TLB invalidation. Do it in tlb_invalidate_addr To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm32/arm32_tlb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/arm32_tlb.c diff -u src/sys/arch/arm/arm32/arm32_tlb.c:1.6 src/sys/arch/arm/arm32/arm32_tlb.c:1.7 --- src/sys/arch/arm/arm32/arm32_tlb.c:1.6 Thu Oct 30 10:38:57 2014 +++ src/sys/arch/arm/arm32/arm32_tlb.c Thu Oct 30 10:45:17 2014 @@ -30,7 +30,7 @@ #include opt_multiprocessor.h #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: arm32_tlb.c,v 1.6 2014/10/30 10:38:57 skrll Exp $); +__KERNEL_RCSID(1, $NetBSD: arm32_tlb.c,v 1.7 2014/10/30 10:45:17 skrll Exp $); #include sys/param.h #include sys/types.h @@ -122,6 +122,7 @@ tlb_invalidate_addr(vaddr_t va, tlb_asid #endif //armreg_tlbiall_write(asid); } + arm_dsb(); arm_isb(); }
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nonaka Date: Thu Oct 30 10:50:44 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Intel Wi-Fi devices. To generate a diff of this commit: cvs rdiff -u -r1.1204 -r1.1205 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1204 src/sys/dev/pci/pcidevs:1.1205 --- src/sys/dev/pci/pcidevs:1.1204 Wed Oct 29 10:21:53 2014 +++ src/sys/dev/pci/pcidevs Thu Oct 30 10:50:44 2014 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1204 2014/10/29 10:21:53 nonaka Exp $ +$NetBSD: pcidevs,v 1.1205 2014/10/30 10:50:44 nonaka Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2596,10 +2596,27 @@ product INTEL 82426EX 0x0486 82426EX PC product INTEL PCMC 0x04a3 82434LX/NX PCI, Cache and Memory Controller (PCMC) product INTEL GDT_RAID1 0x0600 GDT RAID product INTEL GDT_RAID2 0x061f GDT RAID +product INTEL WIFI_LINK_6150_1 0x0885 Centrino Wireless-N 6150 +product INTEL WIFI_LINK_6150_2 0x0886 Centrino Wireless-N 6150 product INTEL WIFI_LINK_2230_1 0x0887 Centrino Wireless-N 2230 product INTEL WIFI_LINK_2230_2 0x0888 Centrino Wireless-N 2230 product INTEL WIFI_LINK_6235 0x088e Centrino Advanced-N 6235 +product INTEL WIFI_LINK_6235_2 0x088f Centrino Advanced-N 6235 +product INTEL WIFI_LINK_2200_1 0x0890 Centrino Wireless-N 2200 +product INTEL WIFI_LINK_2200_2 0x0891 Centrino Wireless-N 2200 +product INTEL WIFI_LINK_135_1 0x0892 Centrino Wireless-N 135 +product INTEL WIFI_LINK_135_2 0x0893 Centrino Wireless-N 135 +product INTEL WIFI_LINK_105_1 0x0894 Centrino Wireless-N 105 +product INTEL WIFI_LINK_105_2 0x0895 Centrino Wireless-N 105 +product INTEL WIFI_LINK_130_1 0x0896 Centrino Wireless-N 130 +product INTEL WIFI_LINK_130_2 0x0897 Centrino Wireless-N 130 product INTEL X1000_SDIO_EMMC 0x08a7 Quark X1000 SDIO/eMMC +product INTEL WIFI_LINK_100_1 0x08ae Centrino Wireless-N 100 +product INTEL WIFI_LINK_100_2 0x08af Centrino Wireless-N 100 +product INTEL WIFI_LINK_7260_1 0x08b1 Dual Band Wireless AC 7260 +product INTEL WIFI_LINK_7260_2 0x08b2 Dual Band Wireless AC 7260 +product INTEL WIFI_LINK_3160_1 0x08b3 Dual Band Wireless AC 3160 +product INTEL WIFI_LINK_3160_2 0x08b4 Dual Band Wirelsss AC 3160 product INTEL X1000_I2C_GPIO 0x0934 Quark X1000 I2C and GPIO product INTEL X1000_SPI 0x0935 Quark X1000 SPI product INTEL X1000_HS_UART 0x0936 Quark X1000 HS-UART @@ -2607,6 +2624,8 @@ product INTEL X1000_MAC 0x0937 Quark X1 product INTEL X1000_EHCI 0x0939 Quark X1000 EHCI product INTEL X1000_OHCI 0x093a Quark X1000 OHCI product INTEL X1000_HB 0x0958 Quark X1000 Host Bridge +product INTEL WIFI_LINK_7265_1 0x095a Dual Band Wireless AC 7265 +product INTEL WIFI_LINK_7265_2 0x095b Dual Band Wireless AC 7265 product INTEL X1000_LB 0x095e Quark X1000 Legacy Bridge product INTEL 80960RM 0x0962 i960 RM PCI-PCI product INTEL 80960RN 0x0964 i960 RN PCI-PCI
CVS commit: [netbsd-7] src/sys/compat/linux/arch
Module Name:src
Committed By: martin
Date: Thu Oct 30 11:51:18 UTC 2014
Modified Files:
src/sys/compat/linux/arch/i386 [netbsd-7]: linux_ptrace.c
src/sys/compat/linux/arch/powerpc [netbsd-7]: linux_ptrace.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #163):
sys/compat/linux/arch/i386/linux_ptrace.c: revision 1.29
sys/compat/linux/arch/powerpc/linux_ptrace.c: revision 1.26
sys/compat/linux/arch/powerpc/linux_ptrace.c: revision 1.27
Fix four memory leaks in compat/linux.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/compat/linux/arch/i386/linux_ptrace.c
cvs rdiff -u -r1.25 -r1.25.2.1 \
src/sys/compat/linux/arch/powerpc/linux_ptrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/i386/linux_ptrace.c
diff -u src/sys/compat/linux/arch/i386/linux_ptrace.c:1.28 src/sys/compat/linux/arch/i386/linux_ptrace.c:1.28.2.1
--- src/sys/compat/linux/arch/i386/linux_ptrace.c:1.28 Tue Apr 15 17:53:09 2014
+++ src/sys/compat/linux/arch/i386/linux_ptrace.c Thu Oct 30 11:51:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ptrace.c,v 1.28 2014/04/15 17:53:09 maxv Exp $ */
+/* $NetBSD: linux_ptrace.c,v 1.28.2.1 2014/10/30 11:51:18 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_ptrace.c,v 1.28 2014/04/15 17:53:09 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_ptrace.c,v 1.28.2.1 2014/10/30 11:51:18 martin Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -182,7 +182,8 @@ linux_sys_ptrace_arch(struct lwp *l, con
mutex_enter(proc_lock);
if ((t = proc_find(SCARG(uap, pid))) == NULL) {
mutex_exit(proc_lock);
- return ESRCH;
+ error = ESRCH;
+ goto out;
}
mutex_enter(t-p_lock);
mutex_exit(proc_lock);
Index: src/sys/compat/linux/arch/powerpc/linux_ptrace.c
diff -u src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.25 src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.25.2.1
--- src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.25 Tue Apr 15 17:53:09 2014
+++ src/sys/compat/linux/arch/powerpc/linux_ptrace.c Thu Oct 30 11:51:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ptrace.c,v 1.25 2014/04/15 17:53:09 maxv Exp $ */
+/* $NetBSD: linux_ptrace.c,v 1.25.2.1 2014/10/30 11:51:18 martin Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_ptrace.c,v 1.25 2014/04/15 17:53:09 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_ptrace.c,v 1.25.2.1 2014/10/30 11:51:18 martin Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -159,7 +159,8 @@ linux_sys_ptrace_arch(struct lwp *l, con
mutex_enter(proc_lock);
if ((t = proc_find(SCARG(uap, pid))) == NULL) {
mutex_exit(proc_lock);
- return ESRCH;
+ error = ESRCH;
+ goto out;
}
mutex_enter(t-p_lock);
mutex_exit(proc_lock);
CVS commit: [netbsd-7] src/sys/dev
Module Name:src
Committed By: martin
Date: Thu Oct 30 12:04:46 UTC 2014
Modified Files:
src/sys/dev/ieee1394 [netbsd-7]: fwcrom.c
src/sys/dev/marvell [netbsd-7]: if_gfe.c
src/sys/dev/pci [netbsd-7]: twa.c
src/sys/dev/pci/cxgb [netbsd-7]: cxgb_offload.c
src/sys/dev/usb [netbsd-7]: stuirda.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #164):
sys/dev/ieee1394/fwcrom.c: revision 1.15
sys/dev/ieee1394/fwcrom.c: revision 1.16
sys/dev/marvell/if_gfe.c: revision 1.43
sys/dev/usb/stuirda.c: revision 1.16
sys/dev/pci/cxgb/cxgb_offload.c: revision 1.4
sys/dev/pci/twa.c: revision 1.51
sys/dev/pci/twa.c: revision 1.52
Various fixes in dev/: remove dead code and fix two inconsistencies.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/dev/ieee1394/fwcrom.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/dev/marvell/if_gfe.c
cvs rdiff -u -r1.50 -r1.50.2.1 src/sys/dev/pci/twa.c
cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/dev/pci/cxgb/cxgb_offload.c
cvs rdiff -u -r1.15 -r1.15.14.1 src/sys/dev/usb/stuirda.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ieee1394/fwcrom.c
diff -u src/sys/dev/ieee1394/fwcrom.c:1.14 src/sys/dev/ieee1394/fwcrom.c:1.14.4.1
--- src/sys/dev/ieee1394/fwcrom.c:1.14 Fri Mar 28 02:16:47 2014
+++ src/sys/dev/ieee1394/fwcrom.c Thu Oct 30 12:04:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fwcrom.c,v 1.14 2014/03/28 02:16:47 christos Exp $ */
+/* $NetBSD: fwcrom.c,v 1.14.4.1 2014/10/30 12:04:46 martin Exp $ */
/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fwcrom.c,v 1.14 2014/03/28 02:16:47 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: fwcrom.c,v 1.14.4.1 2014/10/30 12:04:46 martin Exp $);
#include sys/param.h
#ifdef _KERNEL
@@ -551,24 +551,15 @@ int
main(void)
{
struct crom_src src;
- struct crom_chunk root, unit1, unit2, unit3;
- struct crom_chunk text1, text2, text3, text4, text5, text6, text7;
+ struct crom_chunk root, unit[3], text[7];
uint32_t buf[256], *p;
int i;
extern const char ostype[];
memset(src, 0, sizeof(src));
memset(root, 0, sizeof(root));
- memset(unit1, 0, sizeof(unit1));
- memset(unit2, 0, sizeof(unit2));
- memset(unit3, 0, sizeof(unit3));
- memset(text1, 0, sizeof(text1));
- memset(text2, 0, sizeof(text2));
- memset(text3, 0, sizeof(text3));
- memset(text3, 0, sizeof(text4));
- memset(text3, 0, sizeof(text5));
- memset(text3, 0, sizeof(text6));
- memset(text3, 0, sizeof(text7));
+ memset(unit, 0, sizeof(unit));
+ memset(text, 0, sizeof(text));
memset(buf, 0, sizeof(buf));
/* BUS info sample */
@@ -594,37 +585,37 @@ main(void)
/* private company_id */
crom_add_entry(root, CSRKEY_VENDOR, 0xacde48);
- crom_add_simple_text(src, root, text1, ostype);
+ crom_add_simple_text(src, root, text[0], ostype);
crom_add_entry(root, CSRKEY_HW, __NetBSD_Version__);
- crom_add_simple_text(src, root, text2, OS_VER_STR);
+ crom_add_simple_text(src, root, text[1], OS_VER_STR);
/* SBP unit directory */
- crom_add_chunk(src, root, unit1, CROM_UDIR);
- crom_add_entry(unit1, CSRKEY_SPEC, CSRVAL_ANSIT10);
- crom_add_entry(unit1, CSRKEY_VER, CSRVAL_T10SBP2);
- crom_add_entry(unit1, CSRKEY_COM_SPEC, CSRVAL_ANSIT10);
- crom_add_entry(unit1, CSRKEY_COM_SET, CSRVAL_SCSI);
+ crom_add_chunk(src, root, unit[0], CROM_UDIR);
+ crom_add_entry(unit[0], CSRKEY_SPEC, CSRVAL_ANSIT10);
+ crom_add_entry(unit[0], CSRKEY_VER, CSRVAL_T10SBP2);
+ crom_add_entry(unit[0], CSRKEY_COM_SPEC, CSRVAL_ANSIT10);
+ crom_add_entry(unit[0], CSRKEY_COM_SET, CSRVAL_SCSI);
/* management_agent */
- crom_add_entry(unit1, CROM_MGM, 0x1000);
- crom_add_entry(unit1, CSRKEY_UNIT_CH, (108) | 8);
+ crom_add_entry(unit[0], CROM_MGM, 0x1000);
+ crom_add_entry(unit[0], CSRKEY_UNIT_CH, (108) | 8);
/* Device type and LUN */
- crom_add_entry(unit1, CROM_LUN, 0);
- crom_add_entry(unit1, CSRKEY_MODEL, 1);
- crom_add_simple_text(src, unit1, text3, scsi_target);
+ crom_add_entry(unit[0], CROM_LUN, 0);
+ crom_add_entry(unit[0], CSRKEY_MODEL, 1);
+ crom_add_simple_text(src, unit[0], text[2], scsi_target);
/* RFC2734 IPv4 over IEEE1394 */
- crom_add_chunk(src, root, unit2, CROM_UDIR);
- crom_add_entry(unit2, CSRKEY_SPEC, CSRVAL_IETF);
- crom_add_simple_text(src, unit2, text4, IANA);
- crom_add_entry(unit2, CSRKEY_VER, 1);
- crom_add_simple_text(src, unit2, text5, IPv4);
+ crom_add_chunk(src, root, unit[1], CROM_UDIR);
+ crom_add_entry(unit[1], CSRKEY_SPEC, CSRVAL_IETF);
+ crom_add_simple_text(src, unit[1], text[3], IANA);
+ crom_add_entry(unit[1], CSRKEY_VER, 1);
+ crom_add_simple_text(src, unit[1], text[4], IPv4);
/* RFC3146 IPv6 over IEEE1394 */
- crom_add_chunk(src, root, unit3, CROM_UDIR);
- crom_add_entry(unit3, CSRKEY_SPEC, CSRVAL_IETF);
-
CVS commit: [netbsd-7] src/sys/arch
Module Name:src Committed By: martin Date: Thu Oct 30 12:14:37 UTC 2014 Modified Files: src/sys/arch/amiga/amiga [netbsd-7]: disksubr.c src/sys/arch/amiga/dev [netbsd-7]: siop.c siop2.c src/sys/arch/arm/arm32 [netbsd-7]: pmap.c src/sys/arch/mvme68k/stand/installboot [netbsd-7]: installboot.c src/sys/arch/news68k/news68k [netbsd-7]: bus_space.c src/sys/arch/newsmips/stand/boot [netbsd-7]: netif_news.c src/sys/arch/x86/x86 [netbsd-7]: x86_autoconf.c Log Message: Pull up following revision(s) (requested by maxv in ticket #165): sys/arch/newsmips/stand/boot/netif_news.c: revision 1.9 sys/arch/mvme68k/stand/installboot/installboot.c: revision 1.19 sys/arch/arm/arm32/pmap.c: revision 1.300 sys/arch/amiga/dev/siop2.c: revision 1.43 sys/arch/amiga/amiga/disksubr.c: revision 1.62 sys/arch/news68k/news68k/bus_space.c: revision 1.13 sys/arch/amiga/dev/siop.c: revision 1.69 sys/arch/x86/x86/x86_autoconf.c: revision 1.72 Remove dead code in various places under arch/. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.61.4.1 src/sys/arch/amiga/amiga/disksubr.c cvs rdiff -u -r1.68 -r1.68.4.1 src/sys/arch/amiga/dev/siop.c cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/amiga/dev/siop2.c cvs rdiff -u -r1.295 -r1.295.2.1 src/sys/arch/arm/arm32/pmap.c cvs rdiff -u -r1.18 -r1.18.8.1 \ src/sys/arch/mvme68k/stand/installboot/installboot.c cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/arch/news68k/news68k/bus_space.c cvs rdiff -u -r1.8 -r1.8.38.1 src/sys/arch/newsmips/stand/boot/netif_news.c cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/arch/x86/x86/x86_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/amiga/disksubr.c diff -u src/sys/arch/amiga/amiga/disksubr.c:1.61 src/sys/arch/amiga/amiga/disksubr.c:1.61.4.1 --- src/sys/arch/amiga/amiga/disksubr.c:1.61 Wed Jan 22 00:25:16 2014 +++ src/sys/arch/amiga/amiga/disksubr.c Thu Oct 30 12:14:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.61 2014/01/22 00:25:16 christos Exp $ */ +/* $NetBSD: disksubr.c,v 1.61.4.1 2014/10/30 12:14:37 martin Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: disksubr.c,v 1.61 2014/01/22 00:25:16 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: disksubr.c,v 1.61.4.1 2014/10/30 12:14:37 martin Exp $); #include sys/param.h #include sys/systm.h @@ -567,16 +567,6 @@ writedisklabel(dev_t dev, void (*strat)( done: brelse(bp, 0); return (error); - - /* - * get write out partition list iff cpu_label is valid. - */ - if (clp-valid == 0 || - (clp-rdblock = 0 || clp-rdblock = RDB_MAXBLOCKS)) - return(EINVAL); - - (void)getrdbmap(dev, strat, lp, clp); - return(EINVAL); } u_long Index: src/sys/arch/amiga/dev/siop.c diff -u src/sys/arch/amiga/dev/siop.c:1.68 src/sys/arch/amiga/dev/siop.c:1.68.4.1 --- src/sys/arch/amiga/dev/siop.c:1.68 Wed Jan 22 00:25:16 2014 +++ src/sys/arch/amiga/dev/siop.c Thu Oct 30 12:14:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: siop.c,v 1.68 2014/01/22 00:25:16 christos Exp $ */ +/* $NetBSD: siop.c,v 1.68.4.1 2014/10/30 12:14:37 martin Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -70,7 +70,7 @@ #include opt_ddb.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: siop.c,v 1.68 2014/01/22 00:25:16 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: siop.c,v 1.68.4.1 2014/10/30 12:14:37 martin Exp $); #include sys/param.h #include sys/systm.h @@ -1127,9 +1127,6 @@ siop_checkintr(struct siop_softc *sc, u_ } /* rp-siop_dcntl |= SIOP_DCNTL_STD;*/ return (0); -#ifdef DDB - Debugger(); -#endif } #endif *status = -1; Index: src/sys/arch/amiga/dev/siop2.c diff -u src/sys/arch/amiga/dev/siop2.c:1.42 src/sys/arch/amiga/dev/siop2.c:1.42.4.1 --- src/sys/arch/amiga/dev/siop2.c:1.42 Wed Jan 22 00:25:16 2014 +++ src/sys/arch/amiga/dev/siop2.c Thu Oct 30 12:14:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: siop2.c,v 1.42 2014/01/22 00:25:16 christos Exp $ */ +/* $NetBSD: siop2.c,v 1.42.4.1 2014/10/30 12:14:37 martin Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -70,7 +70,7 @@ #include opt_ddb.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: siop2.c,v 1.42 2014/01/22 00:25:16 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: siop2.c,v 1.42.4.1 2014/10/30 12:14:37 martin Exp $); #include sys/param.h #include sys/systm.h @@ -1256,9 +1256,6 @@ siopng_checkintr(struct siop_softc *sc, } /* rp-siop_dcntl |= SIOP_DCNTL_STD;*/ return (0); -#ifdef DDB - Debugger(); -#endif } #endif *status = -1; Index: src/sys/arch/arm/arm32/pmap.c diff -u src/sys/arch/arm/arm32/pmap.c:1.295 src/sys/arch/arm/arm32/pmap.c:1.295.2.1 --- src/sys/arch/arm/arm32/pmap.c:1.295 Fri Jul 25 15:09:43 2014
CVS commit: [netbsd-7] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Thu Oct 30 12:18:56 UTC 2014
Modified Files:
src/sys/compat/netbsd32 [netbsd-7]: netbsd32_compat_50.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #166):
sys/compat/netbsd32/netbsd32_compat_50.c: revision 1.28
fix multiple mistakes:
- error from copyout was ignored
- the wrong size was specified in copyin
- missing locking.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/compat/netbsd32/netbsd32_compat_50.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.24 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.24.2.1
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.24 Tue Jun 24 14:33:57 2014
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Thu Oct 30 12:18:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.24 2014/06/24 14:33:57 maxv Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.24.2.1 2014/10/30 12:18:56 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_compat_50.c,v 1.24 2014/06/24 14:33:57 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_compat_50.c,v 1.24.2.1 2014/10/30 12:18:56 martin Exp $);
#if defined(_KERNEL_OPT)
#include opt_sysv.h
@@ -248,30 +248,31 @@ compat_50_netbsd32_adjtime(struct lwp *l
return (error);
if (SCARG_P32(uap, olddelta)) {
+ mutex_spin_enter(timecounter_lock);
atv.tv_sec = time_adjtime / 100;
atv.tv_usec = time_adjtime % 100;
if (atv.tv_usec 0) {
atv.tv_usec += 100;
atv.tv_sec--;
}
- (void) copyout(atv,
- SCARG_P32(uap, olddelta),
- sizeof(atv));
+ mutex_spin_exit(timecounter_lock);
+
+ error = copyout(atv, SCARG_P32(uap, olddelta), sizeof(atv));
if (error)
return (error);
}
if (SCARG_P32(uap, delta)) {
- error = copyin(SCARG_P32(uap, delta), atv,
- sizeof(struct timeval));
+ error = copyin(SCARG_P32(uap, delta), atv, sizeof(atv));
if (error)
return (error);
+ mutex_spin_enter(timecounter_lock);
time_adjtime = (int64_t)atv.tv_sec * 100 + atv.tv_usec;
-
if (time_adjtime)
/* We need to save the system time during shutdown */
time_adjusted |= 1;
+ mutex_spin_exit(timecounter_lock);
}
return 0;
CVS commit: [netbsd-7] src/sys/arch/m68k/m68k
Module Name:src
Committed By: martin
Date: Thu Oct 30 12:30:24 UTC 2014
Modified Files:
src/sys/arch/m68k/m68k [netbsd-7]: db_disasm.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #167):
sys/arch/m68k/m68k/db_disasm.c: revision 1.41
fix cut-n-paste
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.4.1 src/sys/arch/m68k/m68k/db_disasm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/m68k/m68k/db_disasm.c
diff -u src/sys/arch/m68k/m68k/db_disasm.c:1.40 src/sys/arch/m68k/m68k/db_disasm.c:1.40.4.1
--- src/sys/arch/m68k/m68k/db_disasm.c:1.40 Sat Oct 19 19:13:51 2013
+++ src/sys/arch/m68k/m68k/db_disasm.c Thu Oct 30 12:30:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.40 2013/10/19 19:13:51 martin Exp $ */
+/* $NetBSD: db_disasm.c,v 1.40.4.1 2014/10/30 12:30:24 martin Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -63,7 +63,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.40 2013/10/19 19:13:51 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.40.4.1 2014/10/30 12:30:24 martin Exp $);
#include sys/param.h
#ifdef _KERNEL
@@ -1189,7 +1189,7 @@ opcode_1000(dis_buffer_t *dbuf, u_short
addstr(dbuf, @-,);
PRINT_AREG(dbuf,BITFIELD(opc,11,9));
addstr(dbuf, @-);
- } else if (IS_INST(SBCDA,opc)) {
+ } else if (IS_INST(SBCDD,opc)) {
addstr(dbuf, sbcd\t);
PRINT_DREG(dbuf,BITFIELD(opc,2,0));
addchar(',');
@@ -1247,7 +1247,7 @@ opcode_1100(dis_buffer_t *dbuf, u_short
addstr(dbuf, @-,);
PRINT_AREG(dbuf,BITFIELD(opc,11,9));
addstr(dbuf, @-);
- } else if (IS_INST(ABCDA,opc)) {
+ } else if (IS_INST(ABCDD,opc)) {
addstr(dbuf, abcd\t);
PRINT_DREG(dbuf,BITFIELD(opc,2,0));
addchar(',');
CVS commit: [netbsd-7] src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: martin
Date: Thu Oct 30 12:33:18 UTC 2014
Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7]: machdep.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #168):
sys/arch/sparc64/sparc64/machdep.c: revision 1.280
Sync cpu_reboot with i386:
- avoid sync and unmount after panic.
- remove vfs_shutdown, we call vfs_sync_all and vfs_unmount* instead.
- resurrect doshutdownhooks since some drivers still use it (eg. sab(4)).
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.278.2.1 src/sys/arch/sparc64/sparc64/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.278 src/sys/arch/sparc64/sparc64/machdep.c:1.278.2.1
--- src/sys/arch/sparc64/sparc64/machdep.c:1.278 Mon Jul 14 12:40:38 2014
+++ src/sys/arch/sparc64/sparc64/machdep.c Thu Oct 30 12:33:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.278 2014/07/14 12:40:38 nakayama Exp $ */
+/* $NetBSD: machdep.c,v 1.278.2.1 2014/10/30 12:33:17 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.278 2014/07/14 12:40:38 nakayama Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.278.2.1 2014/10/30 12:33:17 martin Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -599,10 +599,13 @@ cpu_reboot(int howto, char *user_boot_st
*/
maybe_dump(howto);
- if ((howto RB_NOSYNC) == 0 !syncdone) {
+ /*
+ * If we've panic'd, don't make the situation potentially
+ * worse by syncing or unmounting the file systems.
+ */
+ if ((howto RB_NOSYNC) == 0 panicstr == NULL) {
if (!syncdone) {
- syncdone = true;
- vfs_shutdown();
+ syncdone = true;
/* XXX used to force unmount as well, here */
vfs_sync_all(l);
/*
@@ -630,6 +633,7 @@ cpu_reboot(int howto, char *user_boot_st
splhigh();
haltsys:
+ doshutdownhooks();
#ifdef MULTIPROCESSOR
/* Stop all secondary cpus */
CVS commit: [netbsd-7] src/sys/arch/evbarm/imx23_olinuxino
Module Name:src Committed By: martin Date: Thu Oct 30 12:35:21 UTC 2014 Modified Files: src/sys/arch/evbarm/imx23_olinuxino [netbsd-7]: imx23_olinuxino_machdep.c Log Message: Pull up following revision(s) (requested by skrll in ticket #169): sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c: revision 1.4 PR/48669 evbarm/imx23_olinuxino (ARM9E) doesn't boot. Don't try to map all memory and fix booting. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.4.1 \ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.3 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.3.4.1 --- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.3 Mon Oct 7 17:36:40 2013 +++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Thu Oct 30 12:35:21 2014 @@ -1,4 +1,4 @@ -/* $Id: imx23_olinuxino_machdep.c,v 1.3 2013/10/07 17:36:40 matt Exp $ */ +/* $Id: imx23_olinuxino_machdep.c,v 1.3.4.1 2014/10/30 12:35:21 martin Exp $ */ /* * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -179,7 +179,7 @@ initarm(void *arg) ((vsize_t)KERNEL_BASE_phys)); arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap, - true); + false); return initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0); }
CVS commit: [netbsd-7] src/lib/libperfuse
Module Name:src Committed By: martin Date: Thu Oct 30 12:38:15 UTC 2014 Modified Files: src/lib/libperfuse [netbsd-7]: ops.c Log Message: Pull up following revision(s) (requested by manu in ticket #170): lib/libperfuse/ops.c: revision 1.77 Fix invalid free in deletextattr FUSE handler Do not free FUSE message on error as it was not allocated. To generate a diff of this commit: cvs rdiff -u -r1.66.2.8 -r1.66.2.9 src/lib/libperfuse/ops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libperfuse/ops.c diff -u src/lib/libperfuse/ops.c:1.66.2.8 src/lib/libperfuse/ops.c:1.66.2.9 --- src/lib/libperfuse/ops.c:1.66.2.8 Mon Oct 13 19:00:16 2014 +++ src/lib/libperfuse/ops.c Thu Oct 30 12:38:15 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ops.c,v 1.66.2.8 2014/10/13 19:00:16 martin Exp $ */ +/* $NetBSD: ops.c,v 1.66.2.9 2014/10/30 12:38:15 martin Exp $ */ /*- * Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved. @@ -3633,9 +3633,11 @@ perfuse_node_deleteextattr(struct puffs_ (void)strlcpy(np, attrname, attrnamelen); error = xchg_msg(pu, opc, pm, NO_PAYLOAD_REPLY_LEN, wait_reply); + if (error != 0) + goto out; ps-ps_destroy_msg(pm); - +out: node_rele(opc); return error; }
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Oct 30 12:40:36 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #163 - #170 To generate a diff of this commit: cvs rdiff -u -r1.1.2.70 -r1.1.2.71 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.70 src/doc/CHANGES-7.0:1.1.2.71 --- src/doc/CHANGES-7.0:1.1.2.70 Thu Oct 30 10:44:07 2014 +++ src/doc/CHANGES-7.0 Thu Oct 30 12:40:36 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.70 2014/10/30 10:44:07 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.71 2014/10/30 12:40:36 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -1870,3 +1870,64 @@ sys/dev/pci/hdaudio/hdaudio_pci.c 1.13 Disestablish interrupt and unmap register when attach failed. [nonaka, ticket #162] +sys/compat/linux/arch/i386/linux_ptrace.c 1.29 +sys/compat/linux/arch/powerpc/linux_ptrace.c 1.26-1.27 + + Fix four memory leaks in compat/linux. + [maxv, ticket #163] + +sys/dev/ieee1394/fwcrom.c 1.15-1.16 +sys/dev/marvell/if_gfe.c 1.43 +sys/dev/pci/cxgb/cxgb_offload.c 1.4 +sys/dev/pci/twa.c1.51-1.52 +sys/dev/usb/stuirda.c1.16 + + Various fixes in dev/: remove dead code and fix two inconsistencies. + [maxv, ticket #164] + +sys/arch/amiga/amiga/disksubr.c 1.62 +sys/arch/amiga/dev/siop.c 1.69 +sys/arch/amiga/dev/siop2.c 1.43 +sys/arch/arm/arm32/pmap.c 1.300 +sys/arch/mvme68k/stand/installboot/installboot.c 1.19 +sys/arch/news68k/news68k/bus_space.c 1.13 +sys/arch/newsmips/stand/boot/netif_news.c 1.9 +sys/arch/x86/x86/x86_autoconf.c 1.72 + + Remove dead code in various places under arch/. + [maxv, ticket #165] + +sys/compat/netbsd32/netbsd32_compat_50.c 1.28 + + Fix multiple mistakes: + - error from copyout was ignored + - the wrong size was specified in copyin + - missing locking. + [mav, ticket #166] + +sys/arch/m68k/m68k/db_disasm.c 1.41 + + Fix cut-n-paste + [maxv, ticket #167] + +sys/arch/sparc64/sparc64/machdep.c 1.280 + + Sync cpu_reboot with i386: + - avoid sync and unmount after panic. + - remove vfs_shutdown, we call vfs_sync_all and vfs_unmount* instead. + - resurrect doshutdownhooks since some drivers still use it + (eg. sab(4)). + [nakayama, ticket #168] + +sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c 1.4 + + PR/48669 evbarm/imx23_olinuxino (ARM9E) doesn't boot. + Don't try to map all memory and fix booting. + [skrll, ticket #169] + +lib/libperfuse/ops.c1.77 + + Fix invalid free in deletextattr FUSE handler: + do not free FUSE message on error as it was not allocated. + [manu, ticket #170] +
CVS commit: src
Module Name:src Committed By: nonaka Date: Thu Oct 30 13:05:59 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi src/external/intel-fw-public: Makefile src/share/man/man4: iwn.4 src/sys/dev/pci: if_iwn.c if_iwnreg.h if_iwnvar.h Added Files: src/external/intel-fw-public/iwl100: Makefile src/external/intel-fw-public/iwl100/dist: LICENSE.iwlwifi-100-ucode README.iwlwifi-100-ucode iwlwifi-100-5.ucode src/external/intel-fw-public/iwl105: Makefile src/external/intel-fw-public/iwl105/dist: LICENSE.iwlwifi-105-ucode README.iwlwifi-105-ucode iwlwifi-105-6.ucode src/external/intel-fw-public/iwl135: Makefile src/external/intel-fw-public/iwl135/dist: LICENSE.iwlwifi-135-ucode README.iwlwifi-135-ucode iwlwifi-135-6.ucode src/external/intel-fw-public/iwl2000: Makefile src/external/intel-fw-public/iwl2000/dist: LICENSE.iwlwifi-2000-ucode README.iwlwifi-2000-ucode iwlwifi-2000-6.ucode src/external/intel-fw-public/iwl2030: Makefile src/external/intel-fw-public/iwl2030/dist: LICENSE.iwlwifi-2030-ucode README.iwlwifi-2030-ucode iwlwifi-2030-6.ucode Log Message: Add support for Intel Centrino Wireless-N 100/105/130/135/2200/2230. From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.1090 -r1.1091 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.7 -r1.8 src/external/intel-fw-public/Makefile cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl100/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl100/dist/LICENSE.iwlwifi-100-ucode \ src/external/intel-fw-public/iwl100/dist/README.iwlwifi-100-ucode \ src/external/intel-fw-public/iwl100/dist/iwlwifi-100-5.ucode cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl105/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl105/dist/LICENSE.iwlwifi-105-ucode \ src/external/intel-fw-public/iwl105/dist/README.iwlwifi-105-ucode \ src/external/intel-fw-public/iwl105/dist/iwlwifi-105-6.ucode cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl135/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl135/dist/LICENSE.iwlwifi-135-ucode \ src/external/intel-fw-public/iwl135/dist/README.iwlwifi-135-ucode \ src/external/intel-fw-public/iwl135/dist/iwlwifi-135-6.ucode cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl2000/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl2000/dist/LICENSE.iwlwifi-2000-ucode \ src/external/intel-fw-public/iwl2000/dist/README.iwlwifi-2000-ucode \ src/external/intel-fw-public/iwl2000/dist/iwlwifi-2000-6.ucode cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl2030/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl2030/dist/LICENSE.iwlwifi-2030-ucode \ src/external/intel-fw-public/iwl2030/dist/README.iwlwifi-2030-ucode \ src/external/intel-fw-public/iwl2030/dist/iwlwifi-2030-6.ucode cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/iwn.4 cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/if_iwn.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_iwnreg.h cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/if_iwnvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1090 src/distrib/sets/lists/base/mi:1.1091 --- src/distrib/sets/lists/base/mi:1.1090 Thu Oct 23 03:45:46 2014 +++ src/distrib/sets/lists/base/mi Thu Oct 30 13:05:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1090 2014/10/23 03:45:46 apb Exp $ +# $NetBSD: mi,v 1.1091 2014/10/30 13:05:58 nonaka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -146,7 +146,12 @@ ./libdata/firmware/if_iwi/ipw2200-ibss.fw base-firmware-root ./libdata/firmware/if_iwi/ipw2200-sniffer.fw base-firmware-root ./libdata/firmware/if_iwn base-firmware-root +./libdata/firmware/if_iwn/LICENSE.iwlwifi-100-ucode base-firmware-root ./libdata/firmware/if_iwn/LICENSE.iwlwifi-1000-ucode base-firmware-root +./libdata/firmware/if_iwn/LICENSE.iwlwifi-105-ucode base-firmware-root +./libdata/firmware/if_iwn/LICENSE.iwlwifi-135-ucode base-firmware-root +./libdata/firmware/if_iwn/LICENSE.iwlwifi-2000-ucode base-firmware-root +./libdata/firmware/if_iwn/LICENSE.iwlwifi-2030-ucode base-firmware-root ./libdata/firmware/if_iwn/LICENSE.iwlwifi-4965-ucode base-firmware-root ./libdata/firmware/if_iwn/LICENSE.iwlwifi-5000-ucode base-firmware-root ./libdata/firmware/if_iwn/LICENSE.iwlwifi-5150-ucode base-firmware-root @@ -154,7 +159,12 @@ ./libdata/firmware/if_iwn/LICENSE.iwlwifi-6000g2a-ucode base-firmware-root ./libdata/firmware/if_iwn/LICENSE.iwlwifi-6000g2b-ucode base-firmware-root ./libdata/firmware/if_iwn/LICENSE.iwlwifi-6050-ucode base-firmware-root
CVS commit: src/doc
Module Name:src Committed By: nonaka Date: Thu Oct 30 13:08:55 UTC 2014 Modified Files: src/doc: CHANGES Log Message: Add support for Intel Centrino Wireless-N 100/105/130/135/2200/2230. To generate a diff of this commit: cvs rdiff -u -r1.2008 -r1.2009 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2008 src/doc/CHANGES:1.2009 --- src/doc/CHANGES:1.2008 Wed Oct 29 18:30:05 2014 +++ src/doc/CHANGES Thu Oct 30 13:08:55 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2008 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2009 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -96,3 +96,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0: rtsx(4): Add support for Realtek RTS5227/RTL8402/RTL8411/RTL8411B. [nonaka 20141029] flex(1): Import flex-2.5.37 [christos 20141029] + iwn(4): Add support for Intel Centrino Wireless-N + 100/105/130/135/2200/2230. From OpenBSD. [nonaka 20141030]
CVS commit: src/doc
Module Name:src Committed By: nonaka Date: Thu Oct 30 13:14:08 UTC 2014 Modified Files: src/doc: CHANGES Log Message: Fix format. To generate a diff of this commit: cvs rdiff -u -r1.2009 -r1.2010 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2009 src/doc/CHANGES:1.2010 --- src/doc/CHANGES:1.2009 Thu Oct 30 13:08:55 2014 +++ src/doc/CHANGES Thu Oct 30 13:14:08 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2009 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2010 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -77,20 +77,21 @@ Changes from NetBSD 7.0 to NetBSD 8.0: dhcpcd(8): Import dhcpcd-6.5.1. [roy 20141018] OpenSSH: Imported 6.7. [christos 20141018] resolvconf(8): Import openresolv-3.6.0 [roy 20141020] - gcc: Support -fsanitize=address + gcc: Support -fsanitize=address [christos 20141022] zoneinfo: Import tzdata2014i. [apb 20141023] - libc: Update to tzcode2014i. [christos 201401023] + libc: Update to tzcode2014i. [christos 20141023] openpam(3): update to 20140912 (ourouparia) [christos 20141024] pppd(8): updated to version 2.4.7. [christos 20141025] acpi(4): Updated ACPICA to 20140926. [christos 20141025] rnd(9): Add explicit enable/disable hooks for callout-driven sources (be more power friendly). [tls 20141026] rnd(9): Make skew source polled so it runs only when there - is entropy demand. [tls 20141026] + is entropy demand. [tls 20141026] rnd(9): Adjust entropy collection from polled sources so it's processed sooner. [tls 20141026] viornd(4): Add driver for VirtIO entropy source available on QEMU, KVM, and Google Compute Engine. From OpenBSD. + [20141026 tls] dhcpcd(8): Import dhcpcd-6.6.0 [roy 20141029] resolvconf(8): Import openresolv-3.6.1 [roy 20141029] rtsx(4): Add support for Realtek RTS5227/RTL8402/RTL8411/RTL8411B.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Thu Oct 30 13:57:14 UTC 2014 Modified Files: src/sys/arch/sparc64/sparc64: pmap.c Log Message: sun4v: ensure that the X (eXecute) bit is set in the TTE To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/sys/arch/sparc64/sparc64/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/pmap.c diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.290 src/sys/arch/sparc64/sparc64/pmap.c:1.291 --- src/sys/arch/sparc64/sparc64/pmap.c:1.290 Thu Sep 4 18:48:29 2014 +++ src/sys/arch/sparc64/sparc64/pmap.c Thu Oct 30 13:57:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.290 2014/09/04 18:48:29 palle Exp $ */ +/* $NetBSD: pmap.c,v 1.291 2014/10/30 13:57:14 palle Exp $ */ /* * * Copyright (C) 1996-1999 Eduardo Horvath. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.290 2014/09/04 18:48:29 palle Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.291 2014/10/30 13:57:14 palle Exp $); #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF @@ -541,6 +541,9 @@ pmap_mp_init(void) 1, /* valid */ 0 /* ie */); tp[i].data |= TLB_L | TLB_CV; + if (CPU_ISSUN4V) + tp[i].data |= SUN4V_TLB_X; + DPRINTF(PDB_BOOT1, (xtlb[%d]: Tag: % PRIx64 Data: % PRIx64 \n, i, tp[i].tag, tp[i].data)); }
CVS commit: src/usr.bin/config
Module Name:src
Committed By: christos
Date: Thu Oct 30 15:13:11 UTC 2014
Modified Files:
src/usr.bin/config: mkheaders.c
Log Message:
remove overflow test that triggered for negative values; we only care
about the hash here.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/config/mkheaders.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/mkheaders.c
diff -u src/usr.bin/config/mkheaders.c:1.23 src/usr.bin/config/mkheaders.c:1.24
--- src/usr.bin/config/mkheaders.c:1.23 Wed Oct 29 21:36:13 2014
+++ src/usr.bin/config/mkheaders.c Thu Oct 30 11:13:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkheaders.c,v 1.23 2014/10/30 01:36:13 christos Exp $ */
+/* $NetBSD: mkheaders.c,v 1.24 2014/10/30 15:13:11 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: mkheaders.c,v 1.23 2014/10/30 01:36:13 christos Exp $);
+__RCSID($NetBSD: mkheaders.c,v 1.24 2014/10/30 15:13:11 christos Exp $);
#include sys/param.h
#include ctype.h
@@ -140,16 +140,18 @@ fprint_global(FILE *fp, const char *name
static unsigned int
global_hash(const char *str)
{
-unsigned long h;
+ unsigned long h;
char *ep;
- /* If the value is a valid numeric, just use it */
+ /*
+ * If the value is a valid numeric, just use it
+ * We don't care about negative values here, we
+ * just use the value as a hash.
+ */
h = strtoul(str, ep, 0);
if (*ep != 0)
/* Otherwise shove through a 32bit CRC function */
h = crc_buf(0, str, strlen(str));
- else if (h UINT_MAX)
- panic(overflow %s = 0x%lx, str, h);
/* Avoid colliding with the value used for undefined options. */
/* At least until I stop any options being set to zero */
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: maxv
Date: Thu Oct 30 16:45:28 UTC 2014
Modified Files:
src/sys/compat/linux/common: linux_uselib.c
Log Message:
Reject non-regular files.
Patch from njoly@.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/linux/common/linux_uselib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_uselib.c
diff -u src/sys/compat/linux/common/linux_uselib.c:1.31 src/sys/compat/linux/common/linux_uselib.c:1.32
--- src/sys/compat/linux/common/linux_uselib.c:1.31 Sun Oct 19 17:33:58 2014
+++ src/sys/compat/linux/common/linux_uselib.c Thu Oct 30 16:45:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_uselib.c,v 1.31 2014/10/19 17:33:58 maxv Exp $ */
+/* $NetBSD: linux_uselib.c,v 1.32 2014/10/30 16:45:28 maxv Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_uselib.c,v 1.31 2014/10/19 17:33:58 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_uselib.c,v 1.32 2014/10/30 16:45:28 maxv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -100,6 +100,11 @@ linux_sys_uselib(struct lwp *l, const st
if (error != 0)
return error;
+ if (vp-v_type != VREG) {
+ error = EINVAL;
+ goto out;
+ }
+
if ((error = vn_rdwr(UIO_READ, vp, (void *) hdr, LINUX_AOUT_HDR_SIZE,
0, UIO_SYSSPACE, IO_NODELOCKED, l-l_cred,
rem, NULL))) {
CVS commit: src/sys/ufs/ffs
Module Name:src Committed By: maxv Date: Thu Oct 30 17:13:41 UTC 2014 Modified Files: src/sys/ufs/ffs: ffs_vfsops.c Log Message: Limit the superblock size to SBLOCKSIZE, not MAXBSIZE. Otherwise memcpy will read beyond the allocated buffer. Discussed a bit on tech-kern@. To generate a diff of this commit: cvs rdiff -u -r1.300 -r1.301 src/sys/ufs/ffs/ffs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ufs/ffs/ffs_vfsops.c diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.300 src/sys/ufs/ffs/ffs_vfsops.c:1.301 --- src/sys/ufs/ffs/ffs_vfsops.c:1.300 Fri Oct 24 13:18:51 2014 +++ src/sys/ufs/ffs/ffs_vfsops.c Thu Oct 30 17:13:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_vfsops.c,v 1.300 2014/10/24 13:18:51 njoly Exp $ */ +/* $NetBSD: ffs_vfsops.c,v 1.301 2014/10/30 17:13:41 maxv Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.300 2014/10/24 13:18:51 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.301 2014/10/30 17:13:41 maxv Exp $); #if defined(_KERNEL_OPT) #include opt_ffs.h @@ -974,7 +974,7 @@ ffs_mountfs(struct vnode *devvp, struct continue; /* Validate size of superblock */ - if (sbsize MAXBSIZE || sbsize sizeof(struct fs)) + if (sbsize SBLOCKSIZE || sbsize sizeof(struct fs)) continue; /* Check that we can handle the file system blocksize */
CVS commit: src/external/bsd/flex/dist
Module Name:src Committed By: christos Date: Thu Oct 30 18:44:05 UTC 2014 Modified Files: src/external/bsd/flex/dist: buf.c ccl.c dfa.c ecs.c filter.c flexdef.h gen.c initparse.c libmain.c libyywrap.c main.c misc.c nfa.c options.c parse.y regex.c scan.l scanflags.c scanopt.c sym.c tables.c tblcmp.c yylex.c Log Message: handle RCSID not being defined To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/buf.c \ src/external/bsd/flex/dist/libmain.c \ src/external/bsd/flex/dist/libyywrap.c src/external/bsd/flex/dist/yylex.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/ccl.c \ src/external/bsd/flex/dist/dfa.c src/external/bsd/flex/dist/ecs.c \ src/external/bsd/flex/dist/nfa.c src/external/bsd/flex/dist/options.c \ src/external/bsd/flex/dist/regex.c src/external/bsd/flex/dist/scanflags.c \ src/external/bsd/flex/dist/sym.c src/external/bsd/flex/dist/tblcmp.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/filter.c \ src/external/bsd/flex/dist/initparse.c src/external/bsd/flex/dist/misc.c \ src/external/bsd/flex/dist/parse.y src/external/bsd/flex/dist/tables.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/flexdef.h cvs rdiff -u -r1.10 -r1.11 src/external/bsd/flex/dist/gen.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/main.c \ src/external/bsd/flex/dist/scan.l src/external/bsd/flex/dist/scanopt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/buf.c diff -u src/external/bsd/flex/dist/buf.c:1.3 src/external/bsd/flex/dist/buf.c:1.4 --- src/external/bsd/flex/dist/buf.c:1.3 Wed Oct 29 14:28:36 2014 +++ src/external/bsd/flex/dist/buf.c Thu Oct 30 14:44:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: buf.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */ +/* $NetBSD: buf.c,v 1.4 2014/10/30 18:44:05 christos Exp $ */ /* flex - tool to generate fast lexical analyzers */ @@ -32,10 +32,9 @@ /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ -#include sys/cdefs.h -__RCSID($NetBSD: buf.c,v 1.3 2014/10/29 18:28:36 christos Exp $); - #include flexdef.h +__RCSID($NetBSD: buf.c,v 1.4 2014/10/30 18:44:05 christos Exp $); + /* Take note: The buffer object is sometimes used as a String buffer (one * continuous string), and sometimes used as a list of strings, usually line by Index: src/external/bsd/flex/dist/libmain.c diff -u src/external/bsd/flex/dist/libmain.c:1.3 src/external/bsd/flex/dist/libmain.c:1.4 --- src/external/bsd/flex/dist/libmain.c:1.3 Wed Oct 29 14:28:36 2014 +++ src/external/bsd/flex/dist/libmain.c Thu Oct 30 14:44:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: libmain.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */ +/* $NetBSD: libmain.c,v 1.4 2014/10/30 18:44:05 christos Exp $ */ /* libmain - flex run-time support library main function */ @@ -22,8 +22,8 @@ /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ -#include sys/cdefs.h -__RCSID($NetBSD: libmain.c,v 1.3 2014/10/29 18:28:36 christos Exp $); +#include flexdef.h +__RCSID($NetBSD: libmain.c,v 1.4 2014/10/30 18:44:05 christos Exp $); extern int yylex(void); Index: src/external/bsd/flex/dist/libyywrap.c diff -u src/external/bsd/flex/dist/libyywrap.c:1.3 src/external/bsd/flex/dist/libyywrap.c:1.4 --- src/external/bsd/flex/dist/libyywrap.c:1.3 Wed Oct 29 14:28:36 2014 +++ src/external/bsd/flex/dist/libyywrap.c Thu Oct 30 14:44:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: libyywrap.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */ +/* $NetBSD: libyywrap.c,v 1.4 2014/10/30 18:44:05 christos Exp $ */ /* libyywrap - flex run-time support library yywrap function */ @@ -22,8 +22,8 @@ /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ -#include sys/cdefs.h -__RCSID($NetBSD: libyywrap.c,v 1.3 2014/10/29 18:28:36 christos Exp $); +#include flexdef.h +__RCSID($NetBSD: libyywrap.c,v 1.4 2014/10/30 18:44:05 christos Exp $); int yywrap(void); int Index: src/external/bsd/flex/dist/yylex.c diff -u src/external/bsd/flex/dist/yylex.c:1.3 src/external/bsd/flex/dist/yylex.c:1.4 --- src/external/bsd/flex/dist/yylex.c:1.3 Wed Oct 29 14:28:36 2014 +++ src/external/bsd/flex/dist/yylex.c Thu Oct 30 14:44:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: yylex.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */ +/* $NetBSD: yylex.c,v 1.4 2014/10/30 18:44:05 christos Exp $ */ /* yylex - scanner front-end for flex */ @@ -32,11 +32,10 @@ /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ -#include sys/cdefs.h -__RCSID($NetBSD:
CVS commit: [netbsd-7] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Thu Oct 30 18:58:45 UTC 2014 Modified Files: src/sys/arch/x86/x86 [netbsd-7]: identcpu.c Log Message: Pull up following revision(s) (requested by riz in ticket #171): sys/arch/x86/x86/identcpu.c: revision 1.46 sys/arch/x86/x86/identcpu.c: revision 1.47 Force x86_xsave_features to 0 when running under XEN. This prevents the use of xsave and xrstor thus fixing the problem in PR/49150. The basic problem is that the way AMD implements those instructions means that information can leak between domains so XEN treats them as privileged. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.45.2.1 src/sys/arch/x86/x86/identcpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/identcpu.c diff -u src/sys/arch/x86/x86/identcpu.c:1.45 src/sys/arch/x86/x86/identcpu.c:1.45.2.1 --- src/sys/arch/x86/x86/identcpu.c:1.45 Tue Jul 8 19:35:36 2014 +++ src/sys/arch/x86/x86/identcpu.c Thu Oct 30 18:58:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: identcpu.c,v 1.45 2014/07/08 19:35:36 msaitoh Exp $ */ +/* $NetBSD: identcpu.c,v 1.45.2.1 2014/10/30 18:58:45 martin Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: identcpu.c,v 1.45 2014/07/08 19:35:36 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: identcpu.c,v 1.45.2.1 2014/10/30 18:58:45 martin Exp $); #include opt_xen.h @@ -757,7 +757,9 @@ cpu_probe_fpu(struct cpu_info *ci) /* XXX these probably ought to be per-cpu */ if (descs[2] 512) x86_fpu_save_size = descs[2]; +#ifndef XEN x86_xsave_features = (uint64_t)descs[3] 32 | descs[0]; +#endif } void
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Oct 30 19:00:12 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #171 To generate a diff of this commit: cvs rdiff -u -r1.1.2.71 -r1.1.2.72 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.71 src/doc/CHANGES-7.0:1.1.2.72 --- src/doc/CHANGES-7.0:1.1.2.71 Thu Oct 30 12:40:36 2014 +++ src/doc/CHANGES-7.0 Thu Oct 30 19:00:12 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.71 2014/10/30 12:40:36 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.72 2014/10/30 19:00:12 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -1931,3 +1931,12 @@ lib/libperfuse/ops.c1.77 do not free FUSE message on error as it was not allocated. [manu, ticket #170] +sys/arch/x86/x86/identcpu.c 1.46-1.47 + + Force x86_xsave_features to 0 when running under XEN. + This prevents the use of xsave and xrstor thus fixing + the problem in PR/49150. The basic problem is that the way AMD + implements those instructions means that information can leak + between domains so XEN treats them as privileged. + [riz, ticket #171] +
CVS commit: src/external/bsd/flex/dist
Module Name:src Committed By: christos Date: Thu Oct 30 20:21:39 UTC 2014 Modified Files: src/external/bsd/flex/dist: libmain.c libyywrap.c Log Message: do the library stubs differently To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/libmain.c \ src/external/bsd/flex/dist/libyywrap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/libmain.c diff -u src/external/bsd/flex/dist/libmain.c:1.4 src/external/bsd/flex/dist/libmain.c:1.5 --- src/external/bsd/flex/dist/libmain.c:1.4 Thu Oct 30 14:44:05 2014 +++ src/external/bsd/flex/dist/libmain.c Thu Oct 30 16:21:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: libmain.c,v 1.4 2014/10/30 18:44:05 christos Exp $ */ +/* $NetBSD: libmain.c,v 1.5 2014/10/30 20:21:39 christos Exp $ */ /* libmain - flex run-time support library main function */ @@ -22,8 +22,10 @@ /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ -#include flexdef.h -__RCSID($NetBSD: libmain.c,v 1.4 2014/10/30 18:44:05 christos Exp $); +#include sys/cdefs.h +#ifdef __RCSID +__RCSID($NetBSD: libmain.c,v 1.5 2014/10/30 20:21:39 christos Exp $); +#endif extern int yylex(void); Index: src/external/bsd/flex/dist/libyywrap.c diff -u src/external/bsd/flex/dist/libyywrap.c:1.4 src/external/bsd/flex/dist/libyywrap.c:1.5 --- src/external/bsd/flex/dist/libyywrap.c:1.4 Thu Oct 30 14:44:05 2014 +++ src/external/bsd/flex/dist/libyywrap.c Thu Oct 30 16:21:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: libyywrap.c,v 1.4 2014/10/30 18:44:05 christos Exp $ */ +/* $NetBSD: libyywrap.c,v 1.5 2014/10/30 20:21:39 christos Exp $ */ /* libyywrap - flex run-time support library yywrap function */ @@ -22,8 +22,10 @@ /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ -#include flexdef.h -__RCSID($NetBSD: libyywrap.c,v 1.4 2014/10/30 18:44:05 christos Exp $); +#include sys/cdefs.h +#ifdef __RCSID +__RCSID($NetBSD: libyywrap.c,v 1.5 2014/10/30 20:21:39 christos Exp $); +#endif int yywrap(void); int
CVS commit: src/usr.bin/config
Module Name:src Committed By: wiz Date: Thu Oct 30 23:18:02 UTC 2014 Modified Files: src/usr.bin/config: TODO Log Message: Spelling fixes. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/config/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/config/TODO diff -u src/usr.bin/config/TODO:1.6 src/usr.bin/config/TODO:1.7 --- src/usr.bin/config/TODO:1.6 Thu Oct 30 08:20:15 2014 +++ src/usr.bin/config/TODO Thu Oct 30 23:18:02 2014 @@ -91,8 +91,8 @@ o Allow easier adding and removing of op o Introduce class. - Every module should be classfied as at least one class, as modular(9) - modules already do. For example, filesystems are marked as vfs, network + Every module should be classified as at least one class, as modular(9) + modules already do. For example, file systems are marked as vfs, network protocols are netproto. Consider to merge devclass into class. @@ -123,7 +123,7 @@ o Support kernel constructor/destructor The .kctors/.kdtors entries are executed by kernel's main() function, unlike userland where start code executes .ctors/.dtors before main(). The hardcoded sequence of various subsystem initializations in init_main.c:main() will be - replaced by an array of .kctors invocaions, and #ifdef's there will be gone. + replaced by an array of .kctors invocations, and #ifdef's there will be gone. o Replace linkset. @@ -139,7 +139,7 @@ o Replace linkset. o Shared kernel objects. - Since NetBSD has not established a clear kernek ABI, every single kernel + Since NetBSD has not established a clear kernel ABI, every single kernel has to build all the objects by their own. As a result, similar kernels (e.g. evbarm kernels) repeatedly compile similar objects, that is waste of energy space.
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: lukem Date: Fri Oct 31 03:27:18 UTC 2014 Modified Files: src/usr.bin/ftp: version.h Log Message: Version 20141026 Ignore special characters unless they're from the command line. Fixes CVE-2014-8517 To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/usr.bin/ftp/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ftp/version.h diff -u src/usr.bin/ftp/version.h:1.84 src/usr.bin/ftp/version.h:1.85 --- src/usr.bin/ftp/version.h:1.84 Sun May 5 10:40:19 2013 +++ src/usr.bin/ftp/version.h Fri Oct 31 03:27:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.84 2013/05/05 10:40:19 lukem Exp $ */ +/* $NetBSD: version.h,v 1.85 2014/10/31 03:27:18 lukem Exp $ */ /*- * Copyright (c) 1999-2009 The NetBSD Foundation, Inc. @@ -34,5 +34,5 @@ #endif #ifndef FTP_VERSION -#define FTP_VERSION 20130220 +#define FTP_VERSION 20141026 #endif
CVS import: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 03:34:40 UTC 2014 Update of /cvsroot/othersrc/usr.bin/tnftp/src In directory ivanova.netbsd.org:/tmp/cvs-serv14549 Log Message: Import NetBSD usr.bin/ftp 20141026: * Don't pay attention to special characters if they don't come from the command line (from jmcneill). Fixes CVE-2014-8517. * PR/34796: Hauke Fath: ftp does not timeout on http fetches Status: Vendor Tag: NetBSD Release Tags: NetBSD-20141026 U othersrc/usr.bin/tnftp/src/ruserpass.c U othersrc/usr.bin/tnftp/src/ftp.1 C othersrc/usr.bin/tnftp/src/fetch.c U othersrc/usr.bin/tnftp/src/util.c U othersrc/usr.bin/tnftp/src/ftp.c U othersrc/usr.bin/tnftp/src/cmdtab.c U othersrc/usr.bin/tnftp/src/ssl.h U othersrc/usr.bin/tnftp/src/main.c U othersrc/usr.bin/tnftp/src/ssl.c U othersrc/usr.bin/tnftp/src/extern.h U othersrc/usr.bin/tnftp/src/progressbar.h U othersrc/usr.bin/tnftp/src/ftp_var.h C othersrc/usr.bin/tnftp/src/version.h U othersrc/usr.bin/tnftp/src/progressbar.c U othersrc/usr.bin/tnftp/src/Makefile U othersrc/usr.bin/tnftp/src/complete.c U othersrc/usr.bin/tnftp/src/domacro.c U othersrc/usr.bin/tnftp/src/cmds.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNetBSD:yesterday -jNetBSD othersrc/usr.bin/tnftp/src
CVS commit: othersrc/usr.bin/tnftp/src
Module Name:othersrc
Committed By: lukem
Date: Fri Oct 31 03:37:59 UTC 2014
Modified Files:
othersrc/usr.bin/tnftp/src: fetch.c version.h
Log Message:
merge NetBSD-20141026
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 othersrc/usr.bin/tnftp/src/fetch.c
cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/src/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/src/fetch.c
diff -u othersrc/usr.bin/tnftp/src/fetch.c:1.19 othersrc/usr.bin/tnftp/src/fetch.c:1.20
--- othersrc/usr.bin/tnftp/src/fetch.c:1.19 Sun May 5 11:17:30 2013
+++ othersrc/usr.bin/tnftp/src/fetch.c Fri Oct 31 03:37:59 2014
@@ -1,5 +1,5 @@
-/* $NetBSD: fetch.c,v 1.19 2013/05/05 11:17:30 lukem Exp $ */
-/* from NetBSD: fetch.c,v 1.202 2013/02/23 13:47:36 christos Exp */
+/* $NetBSD: fetch.c,v 1.20 2014/10/31 03:37:59 lukem Exp $ */
+/* from NetBSD: fetch.c,v 1.206 2014/10/26 16:21:59 christos Exp */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID( NetBSD: fetch.c,v 1.202 2013/02/23 13:47:36 christos Exp );
+__RCSID( NetBSD: fetch.c,v 1.206 2014/10/26 16:21:59 christos Exp );
#endif /* not lint */
/*
@@ -87,6 +87,7 @@ typedef enum {
} url_t;
__dead static void aborthttp(int);
+__dead static void timeouthttp(int);
#ifndef NO_AUTH
static int auth_url(const char *, char **, const char *, const char *);
static void base64_encode(const unsigned char *, size_t, unsigned char *);
@@ -499,8 +500,10 @@ fetch_url(const char *url, const char *p
{
struct addrinfo hints, *res, *res0 = NULL;
int error;
- sigfunc volatile oldintr;
- sigfunc volatile oldintp;
+ sigfunc volatile oldint;
+ sigfunc volatile oldpipe;
+ sigfunc volatile oldalrm;
+ sigfunc volatile oldquit;
int volatile s;
struct stat sb;
int volatile ischunked;
@@ -526,6 +529,7 @@ fetch_url(const char *url, const char *p
int (*volatile closefunc)(FILE *);
FETCH *volatile fin;
FILE *volatile fout;
+ const char *volatile penv = proxyenv;
time_t mtime;
url_t urltype;
in_port_t portnum;
@@ -533,9 +537,9 @@ fetch_url(const char *url, const char *p
void *ssl;
#endif
- DPRINTF(fetch_url: `%s' proxyenv `%s'\n, url, STRorNULL(proxyenv));
+ DPRINTF(%s: `%s' proxyenv `%s'\n, __func__, url, STRorNULL(penv));
- oldintr = oldintp = NULL;
+ oldquit = oldalrm = oldint = oldpipe = NULL;
closefunc = NULL;
fin = NULL;
fout = NULL;
@@ -546,6 +550,9 @@ fetch_url(const char *url, const char *p
rval = 1;
uuser = pass = host = path = decodedpath = puser = ppass = NULL;
+ if (sigsetjmp(httpabort, 1))
+ goto cleanup_fetch_url;
+
if (parse_url(url, URL, urltype, uuser, pass, host, port,
portnum, path) == -1)
goto cleanup_fetch_url;
@@ -571,7 +578,7 @@ fetch_url(const char *url, const char *p
url_decode(decodedpath);
if (outfile)
- savefile = ftp_strdup(outfile);
+ savefile = outfile;
else {
cp = strrchr(decodedpath, '/'); /* find savefile */
if (cp != NULL)
@@ -579,7 +586,7 @@ fetch_url(const char *url, const char *p
else
savefile = ftp_strdup(decodedpath);
}
- DPRINTF(fetch_url: savefile `%s'\n, savefile);
+ DPRINTF(%s: savefile `%s'\n, __func__, savefile);
if (EMPTYSTRING(savefile)) {
if (urltype == FTP_URL_T) {
rval = fetch_ftp(url);
@@ -595,8 +602,7 @@ fetch_url(const char *url, const char *p
rangestart = rangeend = entitylen = -1;
mtime = -1;
if (restartautofetch) {
- if (strcmp(savefile, -) != 0 *savefile != '|'
- stat(savefile, sb) == 0)
+ if (stat(savefile, sb) == 0)
restart_point = sb.st_size;
}
if (urltype == FILE_URL_T) { /* file:// URLs */
@@ -631,18 +637,18 @@ fetch_url(const char *url, const char *p
const char *leading;
int hasleading;
- if (proxyenv == NULL) {
+ if (penv == NULL) {
#ifdef WITH_SSL
if (urltype == HTTPS_URL_T)
-proxyenv = getoptionvalue(https_proxy);
+penv = getoptionvalue(https_proxy);
#endif
- if (proxyenv == NULL IS_HTTP_TYPE(urltype))
-proxyenv = getoptionvalue(http_proxy);
+ if (penv == NULL IS_HTTP_TYPE(urltype))
+penv = getoptionvalue(http_proxy);
else if (urltype == FTP_URL_T)
-proxyenv = getoptionvalue(ftp_proxy);
+penv = getoptionvalue(ftp_proxy);
}
direction = retrieved;
- if (! EMPTYSTRING(proxyenv)) { /* use proxy */
+ if (! EMPTYSTRING(penv)) { /* use proxy */
url_t purltype;
char *phost, *ppath;
char *pport, *no_proxy;
@@ -689,10 +695,10 @@ fetch_url(const char *url, const char *p
if (isproxy) {
if (restart_point) {
warnx(Can't restart via proxy URL `%s',
- proxyenv);
+ penv);
goto cleanup_fetch_url;
}
-if (parse_url(proxyenv, proxy URL, purltype,
+if (parse_url(penv, proxy URL, purltype,
puser, ppass, phost, pport, pportnum,
ppath) == -1)
goto
CVS commit: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 03:57:14 UTC 2014 Modified Files: othersrc/usr.bin/tnftp/src: ssl.h Log Message: Remove __printflike() attribute; not portable. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 othersrc/usr.bin/tnftp/src/ssl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/src/ssl.h diff -u othersrc/usr.bin/tnftp/src/ssl.h:1.1.1.2 othersrc/usr.bin/tnftp/src/ssl.h:1.2 --- othersrc/usr.bin/tnftp/src/ssl.h:1.1.1.2 Fri Oct 31 03:32:55 2014 +++ othersrc/usr.bin/tnftp/src/ssl.h Fri Oct 31 03:57:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ssl.h,v 1.1.1.2 2014/10/31 03:32:55 lukem Exp $ */ +/* $NetBSD: ssl.h,v 1.2 2014/10/31 03:57:14 lukem Exp $ */ /* from NetBSD: ssl.h,v 1.2 2014/01/07 02:07:08 joerg Exp */ /*- @@ -32,7 +32,7 @@ struct fetch_connect; int fetch_printf(struct fetch_connect *, const char *fmt, ...) -__printflike(2, 3); +; int fetch_fileno(struct fetch_connect *); int fetch_error(struct fetch_connect *); int fetch_flush(struct fetch_connect *);
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 04:03:54 UTC 2014 Modified Files: othersrc/usr.bin/tnftp: configure.ac Log Message: Release tnftp 20141031: * Ignore special character behaviour in filenames not provided by the user. Fixes CVE-2014-8517. * Fix timeout on HTTP fetches. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 othersrc/usr.bin/tnftp/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/configure.ac diff -u othersrc/usr.bin/tnftp/configure.ac:1.25 othersrc/usr.bin/tnftp/configure.ac:1.26 --- othersrc/usr.bin/tnftp/configure.ac:1.25 Sun May 5 13:50:50 2013 +++ othersrc/usr.bin/tnftp/configure.ac Fri Oct 31 04:03:54 2014 @@ -1,15 +1,15 @@ -# $NetBSD: configure.ac,v 1.25 2013/05/05 13:50:50 lukem Exp $ +# $NetBSD: configure.ac,v 1.26 2014/10/31 04:03:54 lukem Exp $ # # Process this file with autoconf to produce a configure script. -AC_INIT([tnftp], [20130505], [lu...@netbsd.org]) +AC_INIT([tnftp], [20141031], [lu...@netbsd.org]) AC_PREREQ([2.69]) AC_COPYRIGHT([ -Copyright (c) 1999-2013 The NetBSD Foundation, Inc. +Copyright (c) 1999-2014 The NetBSD Foundation, Inc. All rights reserved. ]) -AC_REVISION([$Revision: 1.25 $]) +AC_REVISION([$Revision: 1.26 $]) AS_SHELL_SANITIZE()
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 04:06:16 UTC 2014 Modified Files: othersrc/usr.bin/tnftp: configure Log Message: regen for tnftp 20141031 To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 othersrc/usr.bin/tnftp/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/configure diff -u othersrc/usr.bin/tnftp/configure:1.40 othersrc/usr.bin/tnftp/configure:1.41 --- othersrc/usr.bin/tnftp/configure:1.40 Sun May 5 13:54:48 2013 +++ othersrc/usr.bin/tnftp/configure Fri Oct 31 04:06:15 2014 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.25 . +# From configure.ac Revision: 1.26 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for tnftp 20130505. +# Generated by GNU Autoconf 2.69 for tnftp 20141031. # # Report bugs to lu...@netbsd.org. # @@ -13,7 +13,7 @@ # gives unlimited permission to copy, distribute and modify it. # # -# Copyright (c) 1999-2013 The NetBSD Foundation, Inc. +# Copyright (c) 1999-2014 The NetBSD Foundation, Inc. # All rights reserved. # ## ## @@ -596,8 +596,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='tnftp' PACKAGE_TARNAME='tnftp' -PACKAGE_VERSION='20130505' -PACKAGE_STRING='tnftp 20130505' +PACKAGE_VERSION='20141031' +PACKAGE_STRING='tnftp 20141031' PACKAGE_BUGREPORT='lu...@netbsd.org' PACKAGE_URL='' @@ -1333,7 +1333,7 @@ if test $ac_init_help = long; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat _ACEOF -\`configure' configures tnftp 20130505 to adapt to many kinds of systems. +\`configure' configures tnftp 20141031 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1403,7 +1403,7 @@ fi if test -n $ac_init_help; then case $ac_init_help in - short | recursive ) echo Configuration of tnftp 20130505:;; + short | recursive ) echo Configuration of tnftp 20141031:;; esac cat \_ACEOF @@ -1518,7 +1518,7 @@ fi test -n $ac_init_help exit $ac_status if $ac_init_version; then cat \_ACEOF -tnftp configure 20130505 +tnftp configure 20141031 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1526,7 +1526,7 @@ This configure script is free software; gives unlimited permission to copy, distribute and modify it. -Copyright (c) 1999-2013 The NetBSD Foundation, Inc. +Copyright (c) 1999-2014 The NetBSD Foundation, Inc. All rights reserved. _ACEOF @@ -2103,7 +2103,7 @@ cat config.log _ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tnftp $as_me 20130505, which was +It was created by tnftp $as_me 20141031, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3067,7 +3067,7 @@ fi # Define the identity of the package. PACKAGE='tnftp' - VERSION='20130505' + VERSION='20141031' cat confdefs.h _ACEOF @@ -15274,7 +15274,7 @@ cat $CONFIG_STATUS \_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log= -This file was extended by tnftp $as_me 20130505, which was +This file was extended by tnftp $as_me 20141031, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -15340,7 +15340,7 @@ _ACEOF cat $CONFIG_STATUS _ACEOF || ac_write_fail=1 ac_cs_config=`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'` ac_cs_version=\\ -tnftp config.status 20130505 +tnftp config.status 20141031 configured by $0, generated by GNU Autoconf 2.69, with options \\\$ac_cs_config\\
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 04:06:54 UTC 2014 Modified Files: othersrc/usr.bin/tnftp: NEWS Log Message: tnftp 20141031 release To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/NEWS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/NEWS diff -u othersrc/usr.bin/tnftp/NEWS:1.9 othersrc/usr.bin/tnftp/NEWS:1.10 --- othersrc/usr.bin/tnftp/NEWS:1.9 Sun May 5 13:53:38 2013 +++ othersrc/usr.bin/tnftp/NEWS Fri Oct 31 04:06:54 2014 @@ -1,6 +1,14 @@ -$NetBSD: NEWS,v 1.9 2013/05/05 13:53:38 lukem Exp $ +$NetBSD: NEWS,v 1.10 2014/10/31 04:06:54 lukem Exp $ -This is tnftp version 20130505. +This is tnftp version 20141031. + +Changes in tnftp from 20130505 to 20141031: + + Ignore special character behaviour in filenames not provided + by the user. + Fixes CVE-2014-8517. + + Fix timeout on HTTP fetches. Changes in tnftp from 20100108 to 20130505:
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 04:13:56 UTC 2014 Modified Files: othersrc/usr.bin/tnftp: ChangeLog Log Message: tnftp 20141031 release, with NetBSD 20141026 merge To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 othersrc/usr.bin/tnftp/ChangeLog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/ChangeLog diff -u othersrc/usr.bin/tnftp/ChangeLog:1.62 othersrc/usr.bin/tnftp/ChangeLog:1.63 --- othersrc/usr.bin/tnftp/ChangeLog:1.62 Sun May 5 13:53:38 2013 +++ othersrc/usr.bin/tnftp/ChangeLog Fri Oct 31 04:13:56 2014 @@ -1,4 +1,15 @@ -$NetBSD: ChangeLog,v 1.62 2013/05/05 13:53:38 lukem Exp $ +$NetBSD: ChangeLog,v 1.63 2014/10/31 04:13:56 lukem Exp $ + + +Fri Oct 31 04:07:38 UTC 2014 lukem + + * Release as tnftp 20141031. + + * Merge NetBSD usr.bin/ftp from 20130220 to 20141026: + - Don't pay attention to special characters if they don't + come from the command line (from jmcneill). + Fixes CVE-2014-8517. + - PR/34796: Hauke Fath: ftp does not timeout on http fetches. Sun May 5 13:51:47 UTC 2013 lukem
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 04:24:30 UTC 2014 Modified Files: othersrc/usr.bin/tnftp: THANKS Log Message: Add Hauke Fath and Jared McNeill. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/THANKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/THANKS diff -u othersrc/usr.bin/tnftp/THANKS:1.6 othersrc/usr.bin/tnftp/THANKS:1.7 --- othersrc/usr.bin/tnftp/THANKS:1.6 Sun May 5 13:41:58 2013 +++ othersrc/usr.bin/tnftp/THANKS Fri Oct 31 04:24:30 2014 @@ -19,9 +19,11 @@ Douwe Kiela Eugene Kotlyarov Geoff Wing Giles Lean +Hauke Fath Havard Eidnes Hubert Feyrer ITOH Yasufumi +Jared McNeill Jason R. Thorpe John Hawkinson Joseph S. Myers
CVS commit: src/tests/usr.bin/config
Module Name:src
Committed By: uebayasi
Date: Fri Oct 31 04:54:17 UTC 2014
Modified Files:
src/tests/usr.bin/config: t_config.sh
Log Message:
config(1): Test undefined options behavior
- Test selecting an undefined options.
- Test negating an undefined options (failing).
- Fix typos in previous.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/config/t_config.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/config/t_config.sh
diff -u src/tests/usr.bin/config/t_config.sh:1.2 src/tests/usr.bin/config/t_config.sh:1.3
--- src/tests/usr.bin/config/t_config.sh:1.2 Wed Oct 29 16:24:32 2014
+++ src/tests/usr.bin/config/t_config.sh Fri Oct 31 04:54:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_config.sh,v 1.2 2014/10/29 16:24:32 uebayasi Exp $
+# $NetBSD: t_config.sh,v 1.3 2014/10/31 04:54:17 uebayasi Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -31,7 +31,15 @@ run_and_check_prep()
mkdir compile
supportdir=$(atf_get_srcdir)/support
- config=$(atf_get_srcdir)/d_${name}
+
+ local config_str
+ eval config_str=\$${name}_config_str
+ if [ -n $config_str ]; then
+ config=d_${name}
+ printf $config_str ${config}
+ else
+ config=$(atf_get_srcdir)/d_${name}
+ fi
}
run_and_check_pass()
@@ -84,6 +92,22 @@ test_case no_pseudo fail Checks that co
test_case deffs_redef fail Checks that config doesn't allow a deffs to use \
the same name as a previous defflag/defparam
+# Selecting an undefined option.
+undefined_opt_config_str='
+include ../d_min
+options UNDEFINED
+'
+test_case undefined_opt pass \
+Checks that config allows a selection for an undefined options
+
+# Negating an undefined option.
+no_undefined_opt_config_str='
+include ../d_min
+no options UNDEFINED
+'
+test_case no_undefined_opt pass \
+Checks that config allows a negation for an undefined options
+
# Check minimal kernel config(1) output
check_min_files()
{
@@ -101,12 +125,14 @@ check_min_files()
check_min_makefile()
{
- grep -q '^%' tmp.template
+ local f=Makefile
+
+ grep -q '^%' $f tmp.template
- grep -q '^MACHINE=regress$'
- grep -q '^PARAM=-DMAXUSERS=4$'
- grep -q '^all: regress$'
- grep -q '^regress:'
+ grep -q '^MACHINE=regress$' $f
+ grep -q '^PARAM=-DMAXUSERS=4$' $f
+ grep -q '^all: regress$' $f
+ grep -q '^regress:' $f
[ ! -s tmp.template ]
:
}
@@ -141,5 +167,7 @@ atf_init_test_cases()
atf_add_test_case postponed_orphan
atf_add_test_case no_pseudo
atf_add_test_case deffs_redef
+ atf_add_test_case undefined_opt
+ atf_add_test_case no_undefined_opt
atf_add_test_case min
}
CVS commit: src/usr.bin/rsh
Module Name:src Committed By: dholland Date: Thu Oct 30 06:13:50 UTC 2014 Modified Files: src/usr.bin/rsh: rsh.c Log Message: Drop setuid before execing rlogin. Failure to do so should be harmless, but is sloppy. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/usr.bin/rsh/rsh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: martin Date: Thu Oct 30 07:53:42 UTC 2014 Modified Files: src/libexec/ld.elf_so: map_object.c Log Message: Avoid use after free, reported by the coverity scanner. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/libexec/ld.elf_so/map_object.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/config
Module Name:src Committed By: uebayasi Date: Thu Oct 30 08:20:15 UTC 2014 Modified Files: src/usr.bin/config: TODO Log Message: config(1): More TODO To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/config/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Oct 30 08:31:27 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: gdb-7.8.1 out. To generate a diff of this commit: cvs rdiff -u -r1.1168 -r1.1169 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: martin Date: Thu Oct 30 09:20:47 UTC 2014 Modified Files: src/sys/external/bsd/drm2/include/linux [netbsd-7]: sched.h Log Message: Pull up following revision(s) (requested by nonaka in ticket #161): sys/external/bsd/drm2/include/linux/sched.h: revision 1.4 Don't call kpause(9) if cold. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/external/bsd/drm2/include/linux/sched.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/pci/hdaudio
Module Name:src Committed By: martin Date: Thu Oct 30 10:36:52 UTC 2014 Modified Files: src/sys/dev/pci/hdaudio [netbsd-7]: hdaudio_pci.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #162): sys/dev/pci/hdaudio/hdaudio_pci.c: revision 1.13 disestalish interrupt and unmap register when attach failed. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/dev/pci/hdaudio/hdaudio_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Thu Oct 30 10:38:57 UTC 2014 Modified Files: src/sys/arch/arm/arm32: arm32_tlb.c Log Message: s/0/KERNEL_PID/ isb after setting TTBCR_S_PD0 as per Example B3-5 Disable non-global mappings when changing ASID in the ARM ARM. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/arm32/arm32_tlb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Oct 30 10:44:07 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #161 and #162 To generate a diff of this commit: cvs rdiff -u -r1.1.2.69 -r1.1.2.70 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Thu Oct 30 10:45:17 UTC 2014 Modified Files: src/sys/arch/arm/arm32: arm32_tlb.c Log Message: Part of break-before-make is to dsb after the TLB invalidation. Do it in tlb_invalidate_addr To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm32/arm32_tlb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nonaka Date: Thu Oct 30 10:50:44 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Intel Wi-Fi devices. To generate a diff of this commit: cvs rdiff -u -r1.1204 -r1.1205 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nonaka Date: Thu Oct 30 10:51:34 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.1198 -r1.1199 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1197 -r1.1198 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/compat/linux/arch
Module Name:src Committed By: martin Date: Thu Oct 30 11:51:18 UTC 2014 Modified Files: src/sys/compat/linux/arch/i386 [netbsd-7]: linux_ptrace.c src/sys/compat/linux/arch/powerpc [netbsd-7]: linux_ptrace.c Log Message: Pull up following revision(s) (requested by maxv in ticket #163): sys/compat/linux/arch/i386/linux_ptrace.c: revision 1.29 sys/compat/linux/arch/powerpc/linux_ptrace.c: revision 1.26 sys/compat/linux/arch/powerpc/linux_ptrace.c: revision 1.27 Fix four memory leaks in compat/linux. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/compat/linux/arch/i386/linux_ptrace.c cvs rdiff -u -r1.25 -r1.25.2.1 \ src/sys/compat/linux/arch/powerpc/linux_ptrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev
Module Name:src Committed By: martin Date: Thu Oct 30 12:04:46 UTC 2014 Modified Files: src/sys/dev/ieee1394 [netbsd-7]: fwcrom.c src/sys/dev/marvell [netbsd-7]: if_gfe.c src/sys/dev/pci [netbsd-7]: twa.c src/sys/dev/pci/cxgb [netbsd-7]: cxgb_offload.c src/sys/dev/usb [netbsd-7]: stuirda.c Log Message: Pull up following revision(s) (requested by maxv in ticket #164): sys/dev/ieee1394/fwcrom.c: revision 1.15 sys/dev/ieee1394/fwcrom.c: revision 1.16 sys/dev/marvell/if_gfe.c: revision 1.43 sys/dev/usb/stuirda.c: revision 1.16 sys/dev/pci/cxgb/cxgb_offload.c: revision 1.4 sys/dev/pci/twa.c: revision 1.51 sys/dev/pci/twa.c: revision 1.52 Various fixes in dev/: remove dead code and fix two inconsistencies. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/dev/ieee1394/fwcrom.c cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/dev/marvell/if_gfe.c cvs rdiff -u -r1.50 -r1.50.2.1 src/sys/dev/pci/twa.c cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/dev/pci/cxgb/cxgb_offload.c cvs rdiff -u -r1.15 -r1.15.14.1 src/sys/dev/usb/stuirda.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch
Module Name:src Committed By: martin Date: Thu Oct 30 12:14:37 UTC 2014 Modified Files: src/sys/arch/amiga/amiga [netbsd-7]: disksubr.c src/sys/arch/amiga/dev [netbsd-7]: siop.c siop2.c src/sys/arch/arm/arm32 [netbsd-7]: pmap.c src/sys/arch/mvme68k/stand/installboot [netbsd-7]: installboot.c src/sys/arch/news68k/news68k [netbsd-7]: bus_space.c src/sys/arch/newsmips/stand/boot [netbsd-7]: netif_news.c src/sys/arch/x86/x86 [netbsd-7]: x86_autoconf.c Log Message: Pull up following revision(s) (requested by maxv in ticket #165): sys/arch/newsmips/stand/boot/netif_news.c: revision 1.9 sys/arch/mvme68k/stand/installboot/installboot.c: revision 1.19 sys/arch/arm/arm32/pmap.c: revision 1.300 sys/arch/amiga/dev/siop2.c: revision 1.43 sys/arch/amiga/amiga/disksubr.c: revision 1.62 sys/arch/news68k/news68k/bus_space.c: revision 1.13 sys/arch/amiga/dev/siop.c: revision 1.69 sys/arch/x86/x86/x86_autoconf.c: revision 1.72 Remove dead code in various places under arch/. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.61.4.1 src/sys/arch/amiga/amiga/disksubr.c cvs rdiff -u -r1.68 -r1.68.4.1 src/sys/arch/amiga/dev/siop.c cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/amiga/dev/siop2.c cvs rdiff -u -r1.295 -r1.295.2.1 src/sys/arch/arm/arm32/pmap.c cvs rdiff -u -r1.18 -r1.18.8.1 \ src/sys/arch/mvme68k/stand/installboot/installboot.c cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/arch/news68k/news68k/bus_space.c cvs rdiff -u -r1.8 -r1.8.38.1 src/sys/arch/newsmips/stand/boot/netif_news.c cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/arch/x86/x86/x86_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/compat/netbsd32
Module Name:src Committed By: martin Date: Thu Oct 30 12:18:56 UTC 2014 Modified Files: src/sys/compat/netbsd32 [netbsd-7]: netbsd32_compat_50.c Log Message: Pull up following revision(s) (requested by maxv in ticket #166): sys/compat/netbsd32/netbsd32_compat_50.c: revision 1.28 fix multiple mistakes: - error from copyout was ignored - the wrong size was specified in copyin - missing locking. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/compat/netbsd32/netbsd32_compat_50.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/m68k/m68k
Module Name:src Committed By: martin Date: Thu Oct 30 12:30:24 UTC 2014 Modified Files: src/sys/arch/m68k/m68k [netbsd-7]: db_disasm.c Log Message: Pull up following revision(s) (requested by maxv in ticket #167): sys/arch/m68k/m68k/db_disasm.c: revision 1.41 fix cut-n-paste To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.4.1 src/sys/arch/m68k/m68k/db_disasm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/sparc64/sparc64
Module Name:src Committed By: martin Date: Thu Oct 30 12:33:18 UTC 2014 Modified Files: src/sys/arch/sparc64/sparc64 [netbsd-7]: machdep.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #168): sys/arch/sparc64/sparc64/machdep.c: revision 1.280 Sync cpu_reboot with i386: - avoid sync and unmount after panic. - remove vfs_shutdown, we call vfs_sync_all and vfs_unmount* instead. - resurrect doshutdownhooks since some drivers still use it (eg. sab(4)). To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.278.2.1 src/sys/arch/sparc64/sparc64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/evbarm/imx23_olinuxino
Module Name:src Committed By: martin Date: Thu Oct 30 12:35:21 UTC 2014 Modified Files: src/sys/arch/evbarm/imx23_olinuxino [netbsd-7]: imx23_olinuxino_machdep.c Log Message: Pull up following revision(s) (requested by skrll in ticket #169): sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c: revision 1.4 PR/48669 evbarm/imx23_olinuxino (ARM9E) doesn't boot. Don't try to map all memory and fix booting. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.4.1 \ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/lib/libperfuse
Module Name:src Committed By: martin Date: Thu Oct 30 12:38:15 UTC 2014 Modified Files: src/lib/libperfuse [netbsd-7]: ops.c Log Message: Pull up following revision(s) (requested by manu in ticket #170): lib/libperfuse/ops.c: revision 1.77 Fix invalid free in deletextattr FUSE handler Do not free FUSE message on error as it was not allocated. To generate a diff of this commit: cvs rdiff -u -r1.66.2.8 -r1.66.2.9 src/lib/libperfuse/ops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Oct 30 12:40:36 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #163 - #170 To generate a diff of this commit: cvs rdiff -u -r1.1.2.70 -r1.1.2.71 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: nonaka Date: Thu Oct 30 13:05:59 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi src/external/intel-fw-public: Makefile src/share/man/man4: iwn.4 src/sys/dev/pci: if_iwn.c if_iwnreg.h if_iwnvar.h Added Files: src/external/intel-fw-public/iwl100: Makefile src/external/intel-fw-public/iwl100/dist: LICENSE.iwlwifi-100-ucode README.iwlwifi-100-ucode iwlwifi-100-5.ucode src/external/intel-fw-public/iwl105: Makefile src/external/intel-fw-public/iwl105/dist: LICENSE.iwlwifi-105-ucode README.iwlwifi-105-ucode iwlwifi-105-6.ucode src/external/intel-fw-public/iwl135: Makefile src/external/intel-fw-public/iwl135/dist: LICENSE.iwlwifi-135-ucode README.iwlwifi-135-ucode iwlwifi-135-6.ucode src/external/intel-fw-public/iwl2000: Makefile src/external/intel-fw-public/iwl2000/dist: LICENSE.iwlwifi-2000-ucode README.iwlwifi-2000-ucode iwlwifi-2000-6.ucode src/external/intel-fw-public/iwl2030: Makefile src/external/intel-fw-public/iwl2030/dist: LICENSE.iwlwifi-2030-ucode README.iwlwifi-2030-ucode iwlwifi-2030-6.ucode Log Message: Add support for Intel Centrino Wireless-N 100/105/130/135/2200/2230. From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.1090 -r1.1091 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.7 -r1.8 src/external/intel-fw-public/Makefile cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl100/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl100/dist/LICENSE.iwlwifi-100-ucode \ src/external/intel-fw-public/iwl100/dist/README.iwlwifi-100-ucode \ src/external/intel-fw-public/iwl100/dist/iwlwifi-100-5.ucode cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl105/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl105/dist/LICENSE.iwlwifi-105-ucode \ src/external/intel-fw-public/iwl105/dist/README.iwlwifi-105-ucode \ src/external/intel-fw-public/iwl105/dist/iwlwifi-105-6.ucode cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl135/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl135/dist/LICENSE.iwlwifi-135-ucode \ src/external/intel-fw-public/iwl135/dist/README.iwlwifi-135-ucode \ src/external/intel-fw-public/iwl135/dist/iwlwifi-135-6.ucode cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl2000/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl2000/dist/LICENSE.iwlwifi-2000-ucode \ src/external/intel-fw-public/iwl2000/dist/README.iwlwifi-2000-ucode \ src/external/intel-fw-public/iwl2000/dist/iwlwifi-2000-6.ucode cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl2030/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl2030/dist/LICENSE.iwlwifi-2030-ucode \ src/external/intel-fw-public/iwl2030/dist/README.iwlwifi-2030-ucode \ src/external/intel-fw-public/iwl2030/dist/iwlwifi-2030-6.ucode cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/iwn.4 cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/if_iwn.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_iwnreg.h cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/if_iwnvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nonaka Date: Thu Oct 30 13:08:55 UTC 2014 Modified Files: src/doc: CHANGES Log Message: Add support for Intel Centrino Wireless-N 100/105/130/135/2200/2230. To generate a diff of this commit: cvs rdiff -u -r1.2008 -r1.2009 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nonaka Date: Thu Oct 30 13:14:08 UTC 2014 Modified Files: src/doc: CHANGES Log Message: Fix format. To generate a diff of this commit: cvs rdiff -u -r1.2009 -r1.2010 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Thu Oct 30 13:57:14 UTC 2014 Modified Files: src/sys/arch/sparc64/sparc64: pmap.c Log Message: sun4v: ensure that the X (eXecute) bit is set in the TTE To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/sys/arch/sparc64/sparc64/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/config
Module Name:src Committed By: christos Date: Thu Oct 30 15:13:11 UTC 2014 Modified Files: src/usr.bin/config: mkheaders.c Log Message: remove overflow test that triggered for negative values; we only care about the hash here. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.bin/config/mkheaders.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: maxv Date: Thu Oct 30 16:45:28 UTC 2014 Modified Files: src/sys/compat/linux/common: linux_uselib.c Log Message: Reject non-regular files. Patch from njoly@. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/compat/linux/common/linux_uselib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/ffs
Module Name:src Committed By: maxv Date: Thu Oct 30 17:13:41 UTC 2014 Modified Files: src/sys/ufs/ffs: ffs_vfsops.c Log Message: Limit the superblock size to SBLOCKSIZE, not MAXBSIZE. Otherwise memcpy will read beyond the allocated buffer. Discussed a bit on tech-kern@. To generate a diff of this commit: cvs rdiff -u -r1.300 -r1.301 src/sys/ufs/ffs/ffs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/flex/dist
Module Name:src Committed By: christos Date: Thu Oct 30 18:44:05 UTC 2014 Modified Files: src/external/bsd/flex/dist: buf.c ccl.c dfa.c ecs.c filter.c flexdef.h gen.c initparse.c libmain.c libyywrap.c main.c misc.c nfa.c options.c parse.y regex.c scan.l scanflags.c scanopt.c sym.c tables.c tblcmp.c yylex.c Log Message: handle RCSID not being defined To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/buf.c \ src/external/bsd/flex/dist/libmain.c \ src/external/bsd/flex/dist/libyywrap.c src/external/bsd/flex/dist/yylex.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/ccl.c \ src/external/bsd/flex/dist/dfa.c src/external/bsd/flex/dist/ecs.c \ src/external/bsd/flex/dist/nfa.c src/external/bsd/flex/dist/options.c \ src/external/bsd/flex/dist/regex.c src/external/bsd/flex/dist/scanflags.c \ src/external/bsd/flex/dist/sym.c src/external/bsd/flex/dist/tblcmp.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/filter.c \ src/external/bsd/flex/dist/initparse.c src/external/bsd/flex/dist/misc.c \ src/external/bsd/flex/dist/parse.y src/external/bsd/flex/dist/tables.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/flexdef.h cvs rdiff -u -r1.10 -r1.11 src/external/bsd/flex/dist/gen.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/main.c \ src/external/bsd/flex/dist/scan.l src/external/bsd/flex/dist/scanopt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Thu Oct 30 18:58:45 UTC 2014 Modified Files: src/sys/arch/x86/x86 [netbsd-7]: identcpu.c Log Message: Pull up following revision(s) (requested by riz in ticket #171): sys/arch/x86/x86/identcpu.c: revision 1.46 sys/arch/x86/x86/identcpu.c: revision 1.47 Force x86_xsave_features to 0 when running under XEN. This prevents the use of xsave and xrstor thus fixing the problem in PR/49150. The basic problem is that the way AMD implements those instructions means that information can leak between domains so XEN treats them as privileged. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.45.2.1 src/sys/arch/x86/x86/identcpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Oct 30 19:00:12 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #171 To generate a diff of this commit: cvs rdiff -u -r1.1.2.71 -r1.1.2.72 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/flex/dist
Module Name:src Committed By: christos Date: Thu Oct 30 20:21:39 UTC 2014 Modified Files: src/external/bsd/flex/dist: libmain.c libyywrap.c Log Message: do the library stubs differently To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/libmain.c \ src/external/bsd/flex/dist/libyywrap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/usr.bin/ztest
Module Name:src Committed By: justin Date: Thu Oct 30 21:15:13 UTC 2014 Modified Files: src/external/cddl/osnet/usr.bin/ztest: Makefile Log Message: Add libraries in order that they will link if static as well as dynamic To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/usr.bin/ztest/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/config
Module Name:src Committed By: wiz Date: Thu Oct 30 23:18:02 UTC 2014 Modified Files: src/usr.bin/config: TODO Log Message: Spelling fixes. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/config/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: lukem Date: Fri Oct 31 03:27:18 UTC 2014 Modified Files: src/usr.bin/ftp: version.h Log Message: Version 20141026 Ignore special characters unless they're from the command line. Fixes CVE-2014-8517 To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/usr.bin/ftp/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 03:34:40 UTC 2014 Update of /cvsroot/othersrc/usr.bin/tnftp/src In directory ivanova.netbsd.org:/tmp/cvs-serv14549 Log Message: Import NetBSD usr.bin/ftp 20141026: * Don't pay attention to special characters if they don't come from the command line (from jmcneill). Fixes CVE-2014-8517. * PR/34796: Hauke Fath: ftp does not timeout on http fetches Status: Vendor Tag: NetBSD Release Tags: NetBSD-20141026 U othersrc/usr.bin/tnftp/src/ruserpass.c U othersrc/usr.bin/tnftp/src/ftp.1 C othersrc/usr.bin/tnftp/src/fetch.c U othersrc/usr.bin/tnftp/src/util.c U othersrc/usr.bin/tnftp/src/ftp.c U othersrc/usr.bin/tnftp/src/cmdtab.c U othersrc/usr.bin/tnftp/src/ssl.h U othersrc/usr.bin/tnftp/src/main.c U othersrc/usr.bin/tnftp/src/ssl.c U othersrc/usr.bin/tnftp/src/extern.h U othersrc/usr.bin/tnftp/src/progressbar.h U othersrc/usr.bin/tnftp/src/ftp_var.h C othersrc/usr.bin/tnftp/src/version.h U othersrc/usr.bin/tnftp/src/progressbar.c U othersrc/usr.bin/tnftp/src/Makefile U othersrc/usr.bin/tnftp/src/complete.c U othersrc/usr.bin/tnftp/src/domacro.c U othersrc/usr.bin/tnftp/src/cmds.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNetBSD:yesterday -jNetBSD othersrc/usr.bin/tnftp/src
CVS commit: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 03:37:59 UTC 2014 Modified Files: othersrc/usr.bin/tnftp/src: fetch.c version.h Log Message: merge NetBSD-20141026 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 othersrc/usr.bin/tnftp/src/fetch.c cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/src/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 03:57:14 UTC 2014 Modified Files: othersrc/usr.bin/tnftp/src: ssl.h Log Message: Remove __printflike() attribute; not portable. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 othersrc/usr.bin/tnftp/src/ssl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 04:03:54 UTC 2014 Modified Files: othersrc/usr.bin/tnftp: configure.ac Log Message: Release tnftp 20141031: * Ignore special character behaviour in filenames not provided by the user. Fixes CVE-2014-8517. * Fix timeout on HTTP fetches. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 othersrc/usr.bin/tnftp/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 04:06:16 UTC 2014 Modified Files: othersrc/usr.bin/tnftp: configure Log Message: regen for tnftp 20141031 To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 othersrc/usr.bin/tnftp/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri Oct 31 04:13:56 UTC 2014 Modified Files: othersrc/usr.bin/tnftp: ChangeLog Log Message: tnftp 20141031 release, with NetBSD 20141026 merge To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 othersrc/usr.bin/tnftp/ChangeLog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
