upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix uncontrolled access to the buffer in rfcomm_sppd(1).

Browse source 
Fix typo in hcsecd(8) man page.

Submitted by: Guido Falsi <mad@madpilot.net>
Reviewed by: imp (mentor)
Approved by: imp (mentor)
This commit is contained in:
Maksim Yevmenkin 2003-12-19 18:15:56 +00:00
parent 913fd65e92
commit 4b1493e53d
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
View file

@ -36,6 +36,7 @@
#include <fcntl.h>
#include <grp.h>
#include <limits.h>
#include <paths.h>
#include <sdp.h>
#include <signal.h>
#include <stdarg.h>
@ -99,7 +100,10 @@ main(int argc, char *argv[])
break;
case 't': /* Slave TTY name */
tty = optarg;
if (optarg[0] != '/')
asprintf(&tty, "%s%s", _PATH_DEV, optarg);
else
tty = optarg;
break;
case 'h':
@ -255,18 +259,31 @@ main(int argc, char *argv[])
static int
sppd_ttys_open(char const *tty, int *amaster, int *aslave)
{
char pty[PATH_MAX];
char pty[PATH_MAX], *slash = NULL;
struct group *gr = NULL;
gid_t ttygid;
struct termios tio;
/*
* Master PTY
* Construct master PTY name. The slave tty name must be less then
* PATH_MAX characters in length, must contain '/' character and
* must not end with '/'.
*/
strlcpy(pty, tty, sizeof(pty));
pty[5] = 'p';
if (strlen(tty) >= sizeof(pty)) {
syslog(LOG_ERR, "Slave tty name is too long");
return (-1);
}
strlcpy(pty, tty, sizeof(pty));
slash = strrchr(pty, '/');
if (slash == NULL || slash[1] == 0) {
syslog(LOG_ERR, "Invalid slave tty name (%s)", tty);
return (-1);
}
slash[1] = 'p';
if (strcmp(pty, tty) == 0) {
syslog(LOG_ERR, "Master and slave tty are the same (%s)", tty);
return (-1);

4
usr.sbin/bluetooth/hcsecd/hcsecd.8
View file

@ -115,8 +115,8 @@ PIN codes.
.Sh FILES
.Bl -tag -width ".Pa /etc/bluetooth/hcsecd.conf" -compact
.It Pa /etc/bluetooth/hcsecd.conf
.It Pa /var/db/hcsecd.pid
.It Pa /var/run/hcsecd.keys
.It Pa /var/db/hcsecd.keys
.It Pa /var/run/hcsecd.pid
.El
.Sh SEE ALSO
.Xr ng_btsocket 4 ,