lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 29 Oct 2014 16:07:55 +0800 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se> Cc: Ian Abbott <abbotti@....co.uk>, H Hartley Sweeten <hsweeten@...ionengravers.com>, devel@...verdev.osuosl.org, Chase Southwood <chase.southwood@...oo.com>, linux-kernel@...r.kernel.org Subject: Re: [PATCH v2] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat On Sat, Oct 18, 2014 at 04:35:08PM +0200, Rickard Strandqvist wrote: > Changed from using strncat to strlcat to simplify the code > > Signed-off-by: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se> > Reviewed-by: Ian Abbott <abbotti@....co.uk> > Reviewed-by: H Hartley Sweeten <hsweeten@...ionengravers.com> > --- > drivers/staging/comedi/drivers/comedi_bond.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c > index 8450c99..85b2f4a 100644 > --- a/drivers/staging/comedi/drivers/comedi_bond.c > +++ b/drivers/staging/comedi/drivers/comedi_bond.c > @@ -61,8 +61,7 @@ struct bonded_device { > }; > > struct comedi_bond_private { > -# define MAX_BOARD_NAME 256 > - char name[MAX_BOARD_NAME]; > + char name[256]; > struct bonded_device **devs; > unsigned ndevs; > unsigned nchans; > @@ -262,12 +261,10 @@ static int do_dev_config(struct comedi_device *dev, struct comedi_devconfig *it) > { > /* Append dev:subdev to devpriv->name */ > char buf[20]; > - int left = > - MAX_BOARD_NAME - strlen(devpriv->name) - 1; > snprintf(buf, sizeof(buf), "%u:%u ", > bdev->minor, bdev->subdev); > - buf[sizeof(buf) - 1] = 0; > - strncat(devpriv->name, buf, left); > + strlcat(devpriv->name, buf, > + sizeof(devpriv->name)); > } > > } Oops, I applied the first version of this, can you send me an updated version with just the new changes here? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists