svn commit: r305287 - in stable: 10/usr.sbin/bluetooth/btpand 11/usr.sbin/bluetooth/btpand

[Dimitry Andric]

Author: dim
Date: Fri Sep  2 17:24:16 2016
New Revision: 305287
URL: https://svnweb.freebsd.org/changeset/base/305287

Log:
  MFC r305023:
  
  Avoid undefined behavior when calling va_start() in bnep_send_control(),
  by making the 'type' parameter a plain unsigned.

Modified:
  stable/10/usr.sbin/bluetooth/btpand/bnep.c
  stable/10/usr.sbin/bluetooth/btpand/btpand.h
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/usr.sbin/bluetooth/btpand/bnep.c
  stable/11/usr.sbin/bluetooth/btpand/btpand.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/usr.sbin/bluetooth/btpand/bnep.c
==============================================================================
--- stable/10/usr.sbin/bluetooth/btpand/bnep.c	Fri Sep  2 17:07:52 2016	(r305286)
+++ stable/10/usr.sbin/bluetooth/btpand/bnep.c	Fri Sep  2 17:24:16 2016	(r305287)
@@ -573,7 +573,7 @@ bnep_recv_filter_multi_addr_rsp(channel_
 }
 
 void
-bnep_send_control(channel_t *chan, uint8_t type, ...)
+bnep_send_control(channel_t *chan, unsigned type, ...)
 {
 	packet_t *pkt;
 	uint8_t *p;
@@ -589,7 +589,7 @@ bnep_send_control(channel_t *chan, uint8
 	va_start(ap, type);
 
 	*p++ = BNEP_CONTROL;
-	*p++ = type;
+	*p++ = (uint8_t)type;
 
 	switch(type) {
 	case BNEP_CONTROL_COMMAND_NOT_UNDERSTOOD:

Modified: stable/10/usr.sbin/bluetooth/btpand/btpand.h
==============================================================================
--- stable/10/usr.sbin/bluetooth/btpand/btpand.h	Fri Sep  2 17:07:52 2016	(r305286)
+++ stable/10/usr.sbin/bluetooth/btpand/btpand.h	Fri Sep  2 17:24:16 2016	(r305287)
@@ -183,7 +183,7 @@ b2eaddr(void *dst, bdaddr_t *src)
 /* bnep.c */
 bool		bnep_send(channel_t *, packet_t *);
 bool		bnep_recv(packet_t *);
-void		bnep_send_control(channel_t *, uint8_t, ...);
+void		bnep_send_control(channel_t *, unsigned, ...);
 
 /* channel.c */
 void		channel_init(void);