daily CVS update output
Updating src tree: U src/external/bsd/ppp/usr.sbin/plugins/Makefile.inc P src/external/bsd/ppp/usr.sbin/plugins/minconn/Makefile P src/external/bsd/ppp/usr.sbin/plugins/passwordfd/Makefile P src/external/bsd/ppp/usr.sbin/plugins/status/Makefile P src/include/ssp/ssp.h P src/lib/libc/ssp/Makefile.inc U src/lib/libc/ssp/ssp_redirect.c P src/share/misc/acronyms.comp P src/sys/dev/pci/ixgbe/ixgbe.c P src/sys/dev/pci/ixgbe/ixgbe_type.h P src/sys/dev/pci/ixgbe/ixv.c Updating xsrc tree: Killing core files: Updating file list: -rw-rw-r-- 1 srcmastr netbsd 41970509 Nov 16 03:03 ls-lRA.gz
Re: sys/dev/usb/if_axen.c
Could you please try this patch?
--- src/sys/dev/usb/if_axen.c.orig 2022-08-20 23:30:49.194557768 +
+++ src/sys/dev/usb/if_axen.c 2023-11-15 23:23:29.684547881 +
@@ -52,6 +52,7 @@ struct axen_type {
uint16_taxen_flags;
#define AX178A 0x0001 /* AX88178a */
#define AX179 0x0002 /* AX88179 */
+#define AX179A 0x0004 /* AX88179A */
};
/*
@@ -605,6 +606,8 @@ axen_attach(device_t parent, device_t se
}
axen_flags = axen_lookup(uaa->uaa_vendor, uaa->uaa_product)->axen_flags;
+ if (UGETW(usbd_get_device_descriptor(dev)->bcdDevice) == 0x0200)
+ axen_flags = AX179A;
err = usbd_device2interface_handle(dev, AXEN_IFACE_IDX, >un_iface);
if (err) {
@@ -663,11 +666,20 @@ axen_attach(device_t parent, device_t se
axen_ax88179_init(un);
+#define AXEN_FW_MODE 0x08
+#define AXEN_FW_MODE_178A179 0x00
+ if (axen_flags & AX179A) {
+ uint8_t val = AXEN_FW_MODE_178A179;
+ axen_cmd(un, AXEN_CMD_MAC_WRITE, 1, AXEN_FW_MODE, );
+ }
+
/* An ASIX chip was detected. Inform the world. */
if (axen_flags & AX178A)
aprint_normal_dev(self, "AX88178a\n");
else if (axen_flags & AX179)
aprint_normal_dev(self, "AX88179\n");
+ else if (axen_flags & AX179A)
+ aprint_normal_dev(self, "AX88179A\n");
else
aprint_normal_dev(self, "(unknown)\n");
Re: ffmpeg6 and SSP?
On Wed, Nov 15, 2023 at 01:48:19PM +0200, Vitaly Shevtsov wrote: > Even arcticfox cannot be built due to the same reason. Christos fixed it - cvs update and rebuild, and check you have # nm -g /lib/libc.so | grep ssp 00055136 T __ssp_protected_getcwd 0005512c T __ssp_protected_read 00055131 T __ssp_protected_readlink 0007cc3a T _getfsspec 0007cc3a W getfsspec 0019822f T isspace 00198245 T isspace_l 0004afb7 T wcsspn Cheers, Patrick
Re: ffmpeg6 and SSP?
On Tue, Nov 14, 2023 at 11:30:27AM +, Patrick Welche wrote: > On Tue, Nov 14, 2023 at 10:32:01AM +, Patrick Welche wrote: > > On Mon, Nov 13, 2023 at 11:22:55AM +, Patrick Welche wrote: > > > I'm pretty sure ffmpeg6 compiled recently, but on today's NetBSD-current > > > with HAVE_GCC=12 and pkgsrc-current I'm seeing > > > > > > => Bootstrap dependency digest>=20211023: found digest-20220214 > > > ===> Checking for vulnerabilities in ffmpeg6-6.0nb6 > > > ===> Building for ffmpeg6-6.0nb6 > > > LD ffmpeg6_g > > > LD ffprobe6_g > > > ld: /usr/lib/crt0.o and /usr/lib/crt0.o: warning: multiple common of > > > `environ' > > > ld: /usr/lib/crt0.o and /usr/lib/crt0.o: warning: multiple common of > > > `environ' > > > ld: libavdevice/libavdevice.so: undefined reference to > > > `__ssp_protected_read' > > > ld: libavdevice/libavdevice.so: undefined reference to > > > `__ssp_protected_read' > > > gmake: *** [Makefile:131: ffprobe6_g] Error 1 > > > gmake: *** Waiting for unfinished jobs > > > gmake: *** [Makefile:131: ffmpeg6_g] Error 1 > > > *** Error code 2 > > > > > > > > > Suggestions? Try no FORTIFY? > > > > I tried "no FORTIFY" on ffmpeg6 as > > > > CONFIGURE_ENV+="CPPFLAGS=\"-D_FORTIFY_SOURCE=0\"" > > > > which didn't help. > > > > I tried a NetBSD-current box with gcc 10.5.0 (i.e., without HAVE_GCC=12) > > which didn't help. > > > > I also see the problem with the simpler lang/gawk package: > > > > ld: awkgram.o: in function `get_src_buf': > > awkgram.c:(.text+0x2d8c): undefined reference to `__ssp_protected_read' > > ld: io.o: in function `iop_alloc': > > io.c:(.text+0xf03): undefined reference to `__ssp_protected_read' > > ld: io.o: in function `get_a_record': > > io.c:(.text+0x22d6): undefined reference to `__ssp_protected_read' > > ld: io.o: in function `after_beginfile': > > io.c:(.text+0x27c7): undefined reference to `__ssp_protected_read' > > ld: io.o: in function `redirect_string': > > io.c:(.text+0x55e7): undefined reference to `__ssp_protected_read' > > ld: io.o:io.c:(.text+0x5606): more undefined references to > > `__ssp_protected_read' follow > > > > If I simply edit /usr/include/ssp/ssp.h to remove the __gnu_inline__ from > > the definition of__ssp_inline and make it static again, then gawk builds, > > > > i.e., reverting > > > > -/* $NetBSD: ssp.h,v 1.14 2023/03/29 13:37:10 christos Exp $*/ > > +/* $NetBSD: ssp.h,v 1.15 2023/11/10 23:03:37 christos Exp $*/ > > > > allows gawk to build. > > Userland was built with MKUPDATE=yes - maybe I didn't rebuild whichever > library should contain the extern definition of __ssp_protected_read ? > > git grep ssp_protected_read > > on https://github.com/NetBSD/src.git returned nothing - where should > the __ssp_protected_read symbol live? Thank you to Christos for putting the symbol in libc today with the addition of ssp_redirect.c! Before: $ nm -g libc.so.12.221 | grep ssp 0007bb8a T _getfsspec 0007bb8a W getfsspec 0019717f T isspace 00197195 T isspace_l 00049f67 T wcsspn After: $ nm -g libc.so.12.221 | grep ssp 00055136 T __ssp_protected_getcwd 0005512c T __ssp_protected_read 00055131 T __ssp_protected_readlink 0007cc3a T _getfsspec 0007cc3a W getfsspec 0019822f T isspace 00198245 T isspace_l 0004afb7 T wcsspn Cheers, Patrick
Re: ffmpeg6 and SSP?
Even arcticfox cannot be built due to the same reason. -- Vitaly
SSP
Talking of SSP, what can you do once a detection happens? I see in /var/log/messages: Nov 15 06:59:32 mail -: mail.example.com exim - - - stack overflow detected; terminated I have: kern.coredump.setid.dump = 1 kern.coredump.setid.path = /var/crash/%n.core proc.curproc.rlimit.coredumpsize.soft = unlimited proc.curproc.rlimit.coredumpsize.hard = unlimited but /var/crash is empty. How do you make use of SSP? Cheers, Patrick
