Differential D3613

Don't panic on duplicated module name.
AbandonedPublic
Actions

Authored by trasz on Sep 9 2015, 1:54 PM.

Details

Reviewers

emaste

Summary

Do not panic when trying to boot with two modules of the same name.

This fixes panic after loading "vesa.ko" from loader and trying to boot
with kern.vty="vt".

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 463
Build 463: arc lint + arc unit

Event Timeline

trasz updated this revision to Diff 8624.Sep 9 2015, 1:54 PM

trasz retitled this revision from to Don't panic on duplicated module name..

trasz updated this object.

trasz edited the test plan for this revision. (Show Details)

Herald added a subscriber: imp. · View Herald TranscriptSep 9 2015, 1:54 PM

trasz added a reviewer: emaste.Sep 9 2015, 1:55 PM

Fixes https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195148.

Abandon - according to kib@ this can lead to accessing uninitialized memory; no way to do it cleanly. The debug message fix was committed.

Revision Contents
Changeset List

Path

Size

sys/

kern/

kern_module.c

19 lines

Diff 8624

View Options

sys/kern/kern_module.c

	Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
	static bool ia_need_loopback_route(const struct in_ifaddr *);			static bool ia_need_loopback_route(const struct in_ifaddr *);

	VNET_DEFINE_STATIC(int, nosameprefix);			VNET_DEFINE_STATIC(int, nosameprefix);
	#define V_nosameprefix VNET(nosameprefix)			#define V_nosameprefix VNET(nosameprefix)
	SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,			SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,
	&VNET_NAME(nosameprefix), 0,			&VNET_NAME(nosameprefix), 0,
	"Refuse to create same prefixes on different interfaces");			"Refuse to create same prefixes on different interfaces");

				VNET_DEFINE_STATIC(bool, broadcast_lowest);
				#define V_broadcast_lowest VNET(broadcast_lowest)
				SYSCTL_BOOL(_net_inet_ip, OID_AUTO, broadcast_lowest, CTLFLAG_VNET \| CTLFLAG_RW,
				&VNET_NAME(broadcast_lowest), 0,
				"Treat lowest address on a subnet (host 0) as broadcast");

	VNET_DECLARE(struct inpcbinfo, ripcbinfo);			VNET_DECLARE(struct inpcbinfo, ripcbinfo);
	#define V_ripcbinfo VNET(ripcbinfo)			#define V_ripcbinfo VNET(ripcbinfo)

	static struct sx in_control_sx;			static struct sx in_control_sx;
	SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");			SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");

	/*			/*
	* Return 1 if an internet address is for a ``local'' host			* Return 1 if an internet address is for a ``local'' host
	▲ Show 20 Lines • Show All 1,066 Lines • ▼ Show 20 Lines
	}			}

	int			int
	in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)			in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)
	{			{

	return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|			return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|
	/*			/*
	* Check for old-style (host 0) broadcast, but			* Optionally check for old-style (host 0) broadcast, but
	* taking into account that RFC 3021 obsoletes it.			* taking into account that RFC 3021 obsoletes it.
	*/			*/
	(ia->ia_subnetmask != IN_RFC3021_MASK &&			(V_broadcast_lowest && ia->ia_subnetmask != IN_RFC3021_MASK &&
				rgrimesUnsubmitted Not Done Inline Actions There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the additional test in the fast path only occurs after the tests we have been doing all along. rgrimes: There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the…
				karelsAuthorUnsubmitted Done Inline Actions Actually, I put it first as a micro-optimization. As it is false by default, the test fails immediately and we don't have to evaluate the rest. karels: Actually, I put it first as a micro-optimization. As it is false by default, the test fails…
	ntohl(in.s_addr) == ia->ia_subnet)) &&			ntohl(in.s_addr) == ia->ia_subnet)) &&
	/*			/*
	* Check for an all one subnetmask. These			* Check for an all one subnetmask. These
	* only exist when an interface gets a secondary			* only exist when an interface gets a secondary
	* address.			* address.
	*/			*/
	ia->ia_subnetmask != (u_long)0xffffffff);			ia->ia_subnetmask != (u_long)0xffffffff);
	}			}
	▲ Show 20 Lines • Show All 521 Lines • Show Last 20 Lines

Don't panic on duplicated module name.AbandonedPublicActions