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 /wctdm24xxp | |
| 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 'wctdm24xxp')
| -rw-r--r-- | wctdm24xxp/base.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/wctdm24xxp/base.c b/wctdm24xxp/base.c index 4104d8d..b46e0af 100644 --- a/wctdm24xxp/base.c +++ b/wctdm24xxp/base.c @@ -3045,10 +3045,12 @@ static int wctdm_initialize(struct wctdm *wc) /* Zapata stuff */ sprintf(wc->span.name, "WCTDM/%d", wc->pos); - sprintf(wc->span.desc, "%s Board %d", wc->variety, wc->pos + 1); - sprintf(wc->span.location, "PCI%s Bus %02d Slot %02d", (wc->flags[0] & FLAG_EXPRESS) ? " Express" : "", wc->dev->bus->number, PCI_SLOT(wc->dev->devfn) + 1); + snprintf(wc->span.desc, sizeof(wc->span.desc) - 1, "%s Board %d", wc->variety, wc->pos + 1); + snprintf(wc->span.location, sizeof(wc->span.location) - 1, + "PCI%s Bus %02d Slot %02d", (wc->flags[0] & FLAG_EXPRESS) ? " Express" : "", + wc->dev->bus->number, PCI_SLOT(wc->dev->devfn) + 1); wc->span.manufacturer = "Digium"; - wc->span.devicetype = wc->variety; + strncpy(wc->span.devicetype, wc->variety, sizeof(wc->span.devicetype) - 1); if (alawoverride) { printk("ALAW override parameter detected. Device will be operating in ALAW\n"); wc->span.deflaw = ZT_LAW_ALAW; |