Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f13864e authored by Karsten Keil's avatar Karsten Keil Committed by Linus Torvalds
Browse files

isdn: avoid copying overly-long strings 

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=9416



Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 552d2f84

drivers/isdn/i4l/isdn_net.c

+4 −4
Original line number Diff line number Diff line
@@ -2104,7 +2104,7 @@ isdn_net_find_icall(int di, int ch, int idx, setup_parm *setup) 
	u_long flags;

	isdn_net_dev *p;

	isdn_net_phone *n;

	char nr[32];

	char nr[ISDN_MSNLEN];

	char *my_eaz;



	/* Search name in netdev-chain */
@@ -2113,7 +2113,7 @@ isdn_net_find_icall(int di, int ch, int idx, setup_parm *setup) 
		nr[1] = '\0';

		printk(KERN_INFO "isdn_net: Incoming call without OAD, assuming '0'\n");

	} else

		strcpy(nr, setup->phone);

		strlcpy(nr, setup->phone, ISDN_MSNLEN);

	si1 = (int) setup->si1;

	si2 = (int) setup->si2;

	if (!setup->eazmsn[0]) {
@@ -2789,7 +2789,7 @@ isdn_net_setcfg(isdn_net_ioctl_cfg * cfg) 
				chidx = -1;

			}

		}

		strcpy(lp->msn, cfg->eaz);

		strlcpy(lp->msn, cfg->eaz, sizeof(lp->msn));

		lp->pre_device = drvidx;

		lp->pre_channel = chidx;

		lp->onhtime = cfg->onhtime;
@@ -2936,7 +2936,7 @@ isdn_net_addphone(isdn_net_ioctl_phone * phone) 
	if (p) {

		if (!(n = kmalloc(sizeof(isdn_net_phone), GFP_KERNEL)))

			return -ENOMEM;

		strcpy(n->num, phone->phone);

		strlcpy(n->num, phone->phone, sizeof(n->num));

		n->next = p->local->phone[phone->outgoing & 1];

		p->local->phone[phone->outgoing & 1] = n;

		return 0;