Skip to contentSkip to conversation

iwlwifi: use a format string for an snprintf()

PATCH In review Dan Carpenter 2 participants 2 messages Dec 4, 2014 – Dec 28, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iwlwifi: use a format string for an snprintf()

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.

drivers/net/wireless/iwlwifi/iwl-drv.c +1 -1
index 38de151..68efe97 100644
@@ -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);
#1 lore raw

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