* [patch -next] iwlwifi: use a format string for an snprintf()
@ 2014-12-04 11:02 Dan Carpenter
2014-12-28 18:57 ` Grumbach, Emmanuel
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2014-12-04 11:02 UTC (permalink / raw)
To: Johannes Berg
Cc: Emmanuel Grumbach, Intel Linux Wireless, John W. Linville,
linux-wireless, kernel-janitors
This will make Kees Cook happy if we specify a format string and, who
knows, maybe someday there will be a firmware version with a percent
character and we'll be glad for this.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 38de151..68efe97 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -1296,7 +1296,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
iwl_dealloc_ucode(drv);
/* Build name of correct-step FW */
- snprintf(firmware_name, sizeof(firmware_name),
+ snprintf(firmware_name, sizeof(firmware_name), "%s",
strrchr(drv->firmware_name, '-'));
snprintf(drv->firmware_name, sizeof(drv->firmware_name),
"%s%s", drv->cfg->fw_name_pre, firmware_name);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch -next] iwlwifi: use a format string for an snprintf()
2014-12-04 11:02 [patch -next] iwlwifi: use a format string for an snprintf() Dan Carpenter
@ 2014-12-28 18:57 ` Grumbach, Emmanuel
0 siblings, 0 replies; 2+ messages in thread
From: Grumbach, Emmanuel @ 2014-12-28 18:57 UTC (permalink / raw)
To: dan.carpenter@oracle.com
Cc: linux-wireless@vger.kernel.org, linville@tuxdriver.com,
ilw@linux.intel.com, Berg, Johannes,
kernel-janitors@vger.kernel.org
T24gVGh1LCAyMDE0LTEyLTA0IGF0IDE0OjAyICswMzAwLCBEYW4gQ2FycGVudGVyIHdyb3RlOg0K
PiBUaGlzIHdpbGwgbWFrZSBLZWVzIENvb2sgaGFwcHkgaWYgd2Ugc3BlY2lmeSBhIGZvcm1hdCBz
dHJpbmcgYW5kLCB3aG8NCj4ga25vd3MsIG1heWJlIHNvbWVkYXkgdGhlcmUgd2lsbCBiZSBhIGZp
cm13YXJlIHZlcnNpb24gd2l0aCBhIHBlcmNlbnQNCj4gY2hhcmFjdGVyIGFuZCB3ZSdsbCBiZSBn
bGFkIGZvciB0aGlzLg0KPiANCj4gU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNh
cnBlbnRlckBvcmFjbGUuY29tPg0KPiANCg0KVGhlIHBhdGNoIHRoYXQgaW50cm9kdWNlcyB0aGlz
IGNvZGUgaGFzIGJlZW4gcmV2ZXJ0ZWQgaW4gLW5leHQsIHNvIHRoaXMNCmRvZXNuJ3QgYXBwbHkg
dGhlcmUuDQoNClRoYW5rIHlvdS4NCg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvd2lyZWxl
c3MvaXdsd2lmaS9pd2wtZHJ2LmMgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC1k
cnYuYw0KPiBpbmRleCAzOGRlMTUxLi42OGVmZTk3IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL25l
dC93aXJlbGVzcy9pd2x3aWZpL2l3bC1kcnYuYw0KPiArKysgYi9kcml2ZXJzL25ldC93aXJlbGVz
cy9pd2x3aWZpL2l3bC1kcnYuYw0KPiBAQCAtMTI5Niw3ICsxMjk2LDcgQEAgc3RhdGljIHZvaWQg
aXdsX3JlcV9md19jYWxsYmFjayhjb25zdCBzdHJ1Y3QgZmlybXdhcmUgKnVjb2RlX3Jhdywgdm9p
ZCAqY29udGV4dCkNCj4gIAkJaXdsX2RlYWxsb2NfdWNvZGUoZHJ2KTsNCj4gIA0KPiAgCQkvKiBC
dWlsZCBuYW1lIG9mIGNvcnJlY3Qtc3RlcCBGVyAqLw0KPiAtCQlzbnByaW50ZihmaXJtd2FyZV9u
YW1lLCBzaXplb2YoZmlybXdhcmVfbmFtZSksDQo+ICsJCXNucHJpbnRmKGZpcm13YXJlX25hbWUs
IHNpemVvZihmaXJtd2FyZV9uYW1lKSwgIiVzIiwNCj4gIAkJCSBzdHJyY2hyKGRydi0+ZmlybXdh
cmVfbmFtZSwgJy0nKSk7DQo+ICAJCXNucHJpbnRmKGRydi0+ZmlybXdhcmVfbmFtZSwgc2l6ZW9m
KGRydi0+ZmlybXdhcmVfbmFtZSksDQo+ICAJCQkgIiVzJXMiLCBkcnYtPmNmZy0+ZndfbmFtZV9w
cmUsIGZpcm13YXJlX25hbWUpOw0KDQo=
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-28 18:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-04 11:02 [patch -next] iwlwifi: use a format string for an snprintf() Dan Carpenter
2014-12-28 18:57 ` Grumbach, Emmanuel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).