Re: [patch] isdn: strcpy() => strlcpy()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Oct 05, 2010 at 06:34:48PM +0200, Dan Carpenter wrote:
> setup.phone and setup.eazmsn are 32 character buffers.
> rcvmsg.msg_data.byte_array is a 48 character buffer.
> sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn is 50 chars.
> 
> I changed the strcpy() so strlcpy() because that's safest.

ITYM "I papered it over, so potentially broken behaviour is harder to
find now"...

> -				strcpy(setup.phone,&(rcvmsg.msg_data.byte_array[4]));
> -				strcpy(setup.eazmsn,
> -					sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn);
> +				strlcpy(setup.phone, &(rcvmsg.msg_data.byte_array[4]),
> +					sizeof(setup.phone));

OK, so what should be done if the damn array contents _is_ longer than that?

> +				strlcpy(setup.eazmsn,
> +					sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn,
> +					sizeof(setup.eazmsn));

Ditto.

> -			strcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn,rcvmsg.msg_data.byte_array);
> +			strlcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn,
> +				rcvmsg.msg_data.byte_array,
> +				sizeof(rcvmsg.msg_data.byte_array));

Huh?  Is it or is it not NUL-terminated?  If it is, then change is pure
cargo-culting; if it is not, you are asking for nasal daemons to fly.
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Kernel Development]     [Kernel Announce]     [Kernel Newbies]     [Linux Networking Development]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Device Mapper]

  Powered by Linux