| Message ID | 20170524212916.9106-1-jarkko.sakkinen@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, May 24, 2017 at 02:29:16PM -0700, Jarkko Sakkinen wrote: > The memory copy from rodata to stack is useless. > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> I already applied this, reviewed-by would be nice for this one but given how obvious this change is, it is not mandatory. I take my chances on this one as a maitainer. /Jarkko > --- > drivers/char/tpm/tpm_infineon.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c > index e3cf9f3545c5..3b1b9f9322d5 100644 > --- a/drivers/char/tpm/tpm_infineon.c > +++ b/drivers/char/tpm/tpm_infineon.c > @@ -397,7 +397,7 @@ static int tpm_inf_pnp_probe(struct pnp_dev *dev, > int vendorid[2]; > int version[2]; > int productid[2]; > - char chipname[20]; > + const char *chipname; > struct tpm_chip *chip; > > /* read IO-ports through PnP */ > @@ -488,13 +488,13 @@ static int tpm_inf_pnp_probe(struct pnp_dev *dev, > > switch ((productid[0] << 8) | productid[1]) { > case 6: > - snprintf(chipname, sizeof(chipname), " (SLD 9630 TT 1.1)"); > + chipname = " (SLD 9630 TT 1.1)"; > break; > case 11: > - snprintf(chipname, sizeof(chipname), " (SLB 9635 TT 1.2)"); > + chipname = " (SLB 9635 TT 1.2)"; > break; > default: > - snprintf(chipname, sizeof(chipname), " (unknown chip)"); > + chipname = " (unknown chip)"; > break; > } > > -- > 2.11.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> The memory copy from rodata to stack is useless. > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> After review, yes that should work. Reviewed-by: Peter Huewe <peterhuewe@gmx.de> > --- > drivers/char/tpm/tpm_infineon.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c > index e3cf9f3545c5..3b1b9f9322d5 100644 > --- a/drivers/char/tpm/tpm_infineon.c > +++ b/drivers/char/tpm/tpm_infineon.c > @@ -397,7 +397,7 @@ static int tpm_inf_pnp_probe(struct pnp_dev *dev, > int vendorid[2]; > int version[2]; > int productid[2]; > - char chipname[20]; > + const char *chipname; > struct tpm_chip *chip; > > /* read IO-ports through PnP */ > @@ -488,13 +488,13 @@ static int tpm_inf_pnp_probe(struct pnp_dev *dev, > > switch ((productid[0] << 8) | productid[1]) { > case 6: > - snprintf(chipname, sizeof(chipname), " (SLD 9630 TT 1.1)"); > + chipname = " (SLD 9630 TT 1.1)"; > break; > case 11: > - snprintf(chipname, sizeof(chipname), " (SLB 9635 TT 1.2)"); > + chipname = " (SLB 9635 TT 1.2)"; > break; > default: > - snprintf(chipname, sizeof(chipname), " (unknown chip)"); > + chipname = " (unknown chip)"; > break; > } > > -- > 2.11.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, May 25, 2017 at 07:29:05AM +0200, Peter Huewe wrote: > > The memory copy from rodata to stack is useless. > > > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > After review, yes that should work. > Reviewed-by: Peter Huewe <peterhuewe@gmx.de> Yes, the string gets stored to rodata section where it is copied to stack :-) Thanx! /Jarkko -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c index e3cf9f3545c5..3b1b9f9322d5 100644 --- a/drivers/char/tpm/tpm_infineon.c +++ b/drivers/char/tpm/tpm_infineon.c @@ -397,7 +397,7 @@ static int tpm_inf_pnp_probe(struct pnp_dev *dev, int vendorid[2]; int version[2]; int productid[2]; - char chipname[20]; + const char *chipname; struct tpm_chip *chip; /* read IO-ports through PnP */ @@ -488,13 +488,13 @@ static int tpm_inf_pnp_probe(struct pnp_dev *dev, switch ((productid[0] << 8) | productid[1]) { case 6: - snprintf(chipname, sizeof(chipname), " (SLD 9630 TT 1.1)"); + chipname = " (SLD 9630 TT 1.1)"; break; case 11: - snprintf(chipname, sizeof(chipname), " (SLB 9635 TT 1.2)"); + chipname = " (SLB 9635 TT 1.2)"; break; default: - snprintf(chipname, sizeof(chipname), " (unknown chip)"); + chipname = " (unknown chip)"; break; }
The memory copy from rodata to stack is useless. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> --- drivers/char/tpm/tpm_infineon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)