From owner-cvs-all Tue May 7 15:14:13 2002 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0C32737B400; Tue, 7 May 2002 15:14:07 -0700 (PDT) Received: (from kbyanc@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g47ME6u60398; Tue, 7 May 2002 15:14:06 -0700 (PDT) (envelope-from kbyanc) Message-Id: <200205072214.g47ME6u60398@freefall.freebsd.org> From: Kelly Yancey Date: Tue, 7 May 2002 15:14:06 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/netinet if_ether.c src/sys/net if_dl.h if_iso88025subr.c iso88025.h X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG kbyanc 2002/05/07 15:14:06 PDT Modified files: sys/netinet if_ether.c sys/net if_dl.h if_iso88025subr.c iso88025.h Log: Move ISO88025 source routing information into sockaddr_dl's sdl_data field. This returns the sdl_data field to a variable-length field. More importantly, this prevents a easily-reproduceable data-corruption bug when the interface name plus the hardware address exceed the sdl_data field's original 12 byte limit. However, token-ring interfaces may still overflow the new sdl_data field's 46 byte limit if the interface name exceeds 6 characters (since 6 characters for interface name plus 6 for hardware address plus 34 for source routing = the size of sdl_data). Further refinements could overcome this limitation but would break binary compatibility; this commit only addresses fixing the bug for commonly-occuring cases without breaking binary compatibility with the intention that the functionality can be MFC'ed to -stable. See message ID's (both send to -arch): 20020421013332.F87395-100000@gateway.posi.net 20020430181359.G11009-300000@gateway.posi.net for a more thorough description of the bug addressed and how to reproduce it. Approved by: silence on -arch and -net Sponsored by: NTT Multimedia Communications Labs MFC after: 1 week Revision Changes Path 1.12 +1 -3 src/sys/net/if_dl.h 1.21 +5 -4 src/sys/net/if_iso88025subr.c 1.6 +10 -1 src/sys/net/iso88025.h 1.93 +7 -8 src/sys/netinet/if_ether.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message