Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 3 Sep 2021 16:21:46 +0200
From:   Len Baker <len.baker@gmx.com>
To:     Joe Perches <joe@perches.com>
Cc:     Len Baker <len.baker@gmx.com>, Borislav Petkov <bp@alien8.de>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Tony Luck <tony.luck@intel.com>,
        James Morse <james.morse@arm.com>,
        Robert Richter <rric@kernel.org>,
        David Laight <David.Laight@ACULAB.COM>,
        Kees Cook <keescook@chromium.org>,
        linux-hardening@vger.kernel.org, linux-edac@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v5] EDAC/mc: Prefer strscpy or scnprintf over strcpy
Message-ID: <20210903142146.GA1998@titan>
References: <20210829161547.6069-1-len.baker@gmx.com>
 <7b6dc45194f28db52740c2a604550f6879dafe36.camel@perches.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <7b6dc45194f28db52740c2a604550f6879dafe36.camel@perches.com>
Precedence: bulk

Hi,

On Sun, Aug 29, 2021 at 09:38:37AM -0700, Joe Perches wrote:
> On Sun, 2021-08-29 at 18:15 +0200, Len Baker wrote:
> > strcpy() performs no bounds checking on the destination buffer. This
> > could result in linear overflows beyond the end of the buffer, leading
> > to all kinds of misbehaviors. The safe replacement is strscpy() [1].
> >
> > However, to simplify and clarify the code, to concatenate labels use
> > the scnprintf() function. This way it is not necessary to check the
> > return value of strscpy (-E2BIG if the parameter count is 0 or the src
> > was truncated) since the scnprintf returns always the number of chars
> > written into the buffer. This function returns always a nul-terminated
> > string even if it needs to be truncated.
> []
> > diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
> []
> > @@ -1113,12 +1116,11 @@ void edac_mc_handle_error(const enum hw_event_=
mc_err_type type,
> > =A0			p =3D e->label;
> > =A0			*p =3D '\0';
> > =A0		} else {
> > -			if (p !=3D e->label) {
> > -				strcpy(p, OTHER_LABEL);
> > -				p +=3D strlen(OTHER_LABEL);
> > -			}
> > -			strcpy(p, dimm->label);
> > -			p +=3D strlen(p);
> > +			const char *or =3D (p !=3D e->label) ? OTHER_LABEL : "";
> > +
> > +			n =3D scnprintf(p, len, "%s%s", or, dimm->label);
> > +			len -=3D n;
> > +			p +=3D n;
>
> A very common and intelligible mechanism for this is:
>
> 	const char *prefix =3D "";
> 	int n =3D 0;
> 	...
> 			n +=3D scnprintf(e->label + n, sizeof(e->label) - n,
> 				       "%s%s", prefix, dimm->label);
> 			prefix =3D " or ";
>
Ok, I will send a new version using this common mechanism. Thanks for the
advise.

Regards,
Len