d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix printing non-terminated strings in devlist XML.

Browse Source 
MFC after:	1 week
This commit is contained in:
Alexander Motin 2014-10-26 15:28:07 +00:00
parent b90638866e
commit fd86d88034
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/cam/ctl/ctl.c
View File

@ -2200,13 +2200,14 @@ ctl_copyout_args(int num_args, struct ctl_be_arg *args)
* Escape characters that are illegal or not recommended in XML. * Escape characters that are illegal or not recommended in XML.
*/ */
int int
ctl_sbuf_printf_esc(struct sbuf *sb, char *str) ctl_sbuf_printf_esc(struct sbuf *sb, char *str, int size)
{ {
char *end = str + size;
int retval; int retval;
retval = 0; retval = 0;
for (; *str; str++) { for (; *str && str < end; str++) {
switch (*str) { switch (*str) {
case '&': case '&':
retval = sbuf_printf(sb, "&amp;"); retval = sbuf_printf(sb, "&amp;");
@ -3198,7 +3199,8 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
break; break;
retval = ctl_sbuf_printf_esc(sb, retval = ctl_sbuf_printf_esc(sb,
lun->be_lun->serial_num); lun->be_lun->serial_num,
sizeof(lun->be_lun->serial_num));
if (retval != 0) if (retval != 0)
break; break;
@ -3213,7 +3215,9 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
if (retval != 0) if (retval != 0)
break; break;
retval = ctl_sbuf_printf_esc(sb,lun->be_lun->device_id); retval = ctl_sbuf_printf_esc(sb,
lun->be_lun->device_id,
sizeof(lun->be_lun->device_id));
if (retval != 0) if (retval != 0)
break; break;

2
sys/cam/ctl/ctl.h
View File

@ -156,7 +156,7 @@ int ctl_port_list(struct ctl_port_entry *entries, int num_entries_alloced,
* Put a string into an sbuf, escaping characters that are illegal or not * Put a string into an sbuf, escaping characters that are illegal or not
* recommended in XML. Note this doesn't escape everything, just > < and &. * recommended in XML. Note this doesn't escape everything, just > < and &.
*/ */
int ctl_sbuf_printf_esc(struct sbuf *sb, char *str); int ctl_sbuf_printf_esc(struct sbuf *sb, char *str, int size);
int ctl_ffz(uint32_t *mask, uint32_t size); int ctl_ffz(uint32_t *mask, uint32_t size);
int ctl_set_mask(uint32_t *mask, uint32_t bit); int ctl_set_mask(uint32_t *mask, uint32_t bit);