diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-04 14:48:23 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-04 14:48:23 +0000 |
| commit | 068d0fa47a1873bf0dd497a100c8659b2add728e (patch) | |
| tree | da0740abcb22011024e7eaf344301ff202e5f666 /zaptel-base.c | |
| parent | 69d38492938f1a7c4d02a1dc63b9af5d6319e661 (diff) | |
use a buffer for the span's device type instead of a string pointer, so each spans can have dynamically set device types instead of constant strings
also fix up some string creation and copying to be safe against buffer overflows
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3281 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zaptel-base.c')
| -rw-r--r-- | zaptel-base.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/zaptel-base.c b/zaptel-base.c index fdcdfa2..c2d1013 100644 --- a/zaptel-base.c +++ b/zaptel-base.c @@ -3177,12 +3177,13 @@ static int zt_common_ioctl(struct inode *node, struct file *file, unsigned int c stack.spaninfo.linecompat = spans[i]->linecompat; strncpy(stack.spaninfo.lboname, zt_lboname(spans[i]->lbo), sizeof(stack.spaninfo.lboname) - 1); if (spans[i]->manufacturer) - strncpy(stack.spaninfo.manufacturer, spans[i]->manufacturer, sizeof(stack.spaninfo.manufacturer)); + strncpy(stack.spaninfo.manufacturer, spans[i]->manufacturer, + sizeof(stack.spaninfo.manufacturer) - 1); if (spans[i]->devicetype) - strncpy(stack.spaninfo.devicetype, spans[i]->devicetype, sizeof(stack.spaninfo.devicetype)); - strncpy(stack.spaninfo.location, spans[i]->location, sizeof(stack.spaninfo.location)); + strncpy(stack.spaninfo.devicetype, spans[i]->devicetype, sizeof(stack.spaninfo.devicetype) - 1); + strncpy(stack.spaninfo.location, spans[i]->location, sizeof(stack.spaninfo.location) - 1); if (spans[i]->spantype) - strncpy(stack.spaninfo.spantype, spans[i]->spantype, sizeof(stack.spaninfo.spantype)); + strncpy(stack.spaninfo.spantype, spans[i]->spantype, sizeof(stack.spaninfo.spantype) - 1); if (copy_to_user((struct zt_spaninfo *) data, &stack.spaninfo, size_to_copy)) return -EFAULT; |