Commit 1da740e0 authored by Takashi Iwai's avatar Takashi Iwai Committed by Kalle Valo
Browse files

prism54: Use scnprintf() for avoiding potential buffer overflow 



Since snprintf() returns the would-be-output size instead of the
actual output size, the succeeding calls may go beyond the given
buffer limit.  Fix it by replacing with scnprintf().

Cc: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent f35ba45c

drivers/net/wireless/intersil/prism54/oid_mgt.c

+17 −17
Original line number Diff line number Diff line
@@ -780,17 +780,17 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str) 
{

	switch (isl_oid[n].flags & OID_FLAG_TYPE) {

	case OID_TYPE_U32:

		return snprintf(str, PRIV_STR_SIZE, "%u\n", r->u);

		return scnprintf(str, PRIV_STR_SIZE, "%u\n", r->u);

	case OID_TYPE_BUFFER:{

			struct obj_buffer *buff = r->ptr;

			return snprintf(str, PRIV_STR_SIZE,

			return scnprintf(str, PRIV_STR_SIZE,

					"size=%u\naddr=0x%X\n", buff->size,

					buff->addr);

		}

		break;

	case OID_TYPE_BSS:{

			struct obj_bss *bss = r->ptr;

			return snprintf(str, PRIV_STR_SIZE,

			return scnprintf(str, PRIV_STR_SIZE,

					"age=%u\nchannel=%u\n"

					"capinfo=0x%X\nrates=0x%X\n"

					"basic_rates=0x%X\n", bss->age,
@@ -801,9 +801,9 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str) 
	case OID_TYPE_BSSLIST:{

			struct obj_bsslist *list = r->ptr;

			int i, k;

			k = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", list->nr);

			k = scnprintf(str, PRIV_STR_SIZE, "nr=%u\n", list->nr);

			for (i = 0; i < list->nr; i++)

				k += snprintf(str + k, PRIV_STR_SIZE - k,

				k += scnprintf(str + k, PRIV_STR_SIZE - k,

					      "bss[%u] :\nage=%u\nchannel=%u\n"

					      "capinfo=0x%X\nrates=0x%X\n"

					      "basic_rates=0x%X\n",
@@ -819,23 +819,23 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str) 
			struct obj_frequencies *freq = r->ptr;

			int i, t;

			printk("nr : %u\n", freq->nr);

			t = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", freq->nr);

			t = scnprintf(str, PRIV_STR_SIZE, "nr=%u\n", freq->nr);

			for (i = 0; i < freq->nr; i++)

				t += snprintf(str + t, PRIV_STR_SIZE - t,

				t += scnprintf(str + t, PRIV_STR_SIZE - t,

					      "mhz[%u]=%u\n", i, freq->mhz[i]);

			return t;

		}

		break;

	case OID_TYPE_MLME:{

			struct obj_mlme *mlme = r->ptr;

			return snprintf(str, PRIV_STR_SIZE,

			return scnprintf(str, PRIV_STR_SIZE,

					"id=0x%X\nstate=0x%X\ncode=0x%X\n",

					mlme->id, mlme->state, mlme->code);

		}

		break;

	case OID_TYPE_MLMEEX:{

			struct obj_mlmeex *mlme = r->ptr;

			return snprintf(str, PRIV_STR_SIZE,

			return scnprintf(str, PRIV_STR_SIZE,

					"id=0x%X\nstate=0x%X\n"

					"code=0x%X\nsize=0x%X\n", mlme->id,

					mlme->state, mlme->code, mlme->size);
@@ -843,7 +843,7 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str) 
		break;

	case OID_TYPE_ATTACH:{

			struct obj_attachment *attach = r->ptr;

			return snprintf(str, PRIV_STR_SIZE,

			return scnprintf(str, PRIV_STR_SIZE,

					"id=%d\nsize=%d\n",

					attach->id,

					attach->size);
@@ -851,7 +851,7 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str) 
		break;

	case OID_TYPE_SSID:{

			struct obj_ssid *ssid = r->ptr;

			return snprintf(str, PRIV_STR_SIZE,

			return scnprintf(str, PRIV_STR_SIZE,

					"length=%u\noctets=%.*s\n",

					ssid->length, ssid->length,

					ssid->octets);
@@ -860,13 +860,13 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str) 
	case OID_TYPE_KEY:{

			struct obj_key *key = r->ptr;

			int t, i;

			t = snprintf(str, PRIV_STR_SIZE,

			t = scnprintf(str, PRIV_STR_SIZE,

				     "type=0x%X\nlength=0x%X\nkey=0x",

				     key->type, key->length);

			for (i = 0; i < key->length; i++)

				t += snprintf(str + t, PRIV_STR_SIZE - t,

				t += scnprintf(str + t, PRIV_STR_SIZE - t,

					      "%02X:", key->key[i]);

			t += snprintf(str + t, PRIV_STR_SIZE - t, "\n");

			t += scnprintf(str + t, PRIV_STR_SIZE - t, "\n");

			return t;

		}

		break;
@@ -874,11 +874,11 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str) 
	case OID_TYPE_ADDR:{

			unsigned char *buff = r->ptr;

			int t, i;

			t = snprintf(str, PRIV_STR_SIZE, "hex data=");

			t = scnprintf(str, PRIV_STR_SIZE, "hex data=");

			for (i = 0; i < isl_oid[n].size; i++)

				t += snprintf(str + t, PRIV_STR_SIZE - t,

				t += scnprintf(str + t, PRIV_STR_SIZE - t,

					      "%02X:", buff[i]);

			t += snprintf(str + t, PRIV_STR_SIZE - t, "\n");

			t += scnprintf(str + t, PRIV_STR_SIZE - t, "\n");

			return t;

		}

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE