d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfxge(4): restructure TLV buffer validation

Browse Source 
Move TLV buffer validation into ef10-specific function and add accessor
function which also converts the partition ID to the internal
representation.

Submitted by:   Richard Houldsworth <rhouldsworth at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D6263
This commit is contained in:
Andrew Rybchenko 2016-05-10 06:51:20 +00:00
parent d4ca548306
commit 5abce2b919
5 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/sfxge/common/efx.h
View File

@ -1370,11 +1370,10 @@ efx_nvram_set_version(
__in efx_nvram_type_t type,
__in_ecount(4) uint16_t version[4]);
/* Validate contents of TLV formatted partition */
extern __checkReturn efx_rc_t
efx_nvram_tlv_validate(
efx_nvram_validate(
__in efx_nic_t *enp,
__in uint32_t partn,
__in efx_nvram_type_t type,
__in_bcount(partn_size) caddr_t partn_data,
__in size_t partn_size);

10
sys/dev/sfxge/common/efx_impl.h
View File

@ -499,9 +499,19 @@ typedef struct efx_nvram_ops_s {
uint32_t *, uint16_t *);
efx_rc_t (*envo_partn_set_version)(efx_nic_t *, uint32_t,
uint16_t *);
efx_rc_t (*envo_buffer_validate)(efx_nic_t *, uint32_t,
caddr_t, size_t);
} efx_nvram_ops_t;
#endif /* EFSYS_OPT_NVRAM */
extern __checkReturn efx_rc_t
efx_nvram_tlv_validate(
__in efx_nic_t *enp,
__in uint32_t partn,
__in_bcount(partn_size) caddr_t partn_data,
__in size_t partn_size);
#if EFSYS_OPT_VPD
typedef struct efx_vpd_ops_s {
efx_rc_t (*evpdo_init)(efx_nic_t *);

41
sys/dev/sfxge/common/efx_nvram.c
View File

@ -51,6 +51,7 @@ static efx_nvram_ops_t __efx_nvram_falcon_ops = {
falcon_nvram_partn_rw_finish, /* envo_partn_rw_finish */
falcon_nvram_partn_get_version, /* envo_partn_get_version */
falcon_nvram_partn_set_version, /* envo_partn_set_version */
NULL, /* envo_partn_validate */
};
#endif /* EFSYS_OPT_FALCON */
@ -70,6 +71,7 @@ static efx_nvram_ops_t __efx_nvram_siena_ops = {
siena_nvram_partn_rw_finish, /* envo_partn_rw_finish */
siena_nvram_partn_get_version, /* envo_partn_get_version */
siena_nvram_partn_set_version, /* envo_partn_set_version */
NULL, /* envo_partn_validate */
};
#endif /* EFSYS_OPT_SIENA */
@ -89,6 +91,7 @@ static efx_nvram_ops_t __efx_nvram_ef10_ops = {
ef10_nvram_partn_rw_finish, /* envo_partn_rw_finish */
ef10_nvram_partn_get_version, /* envo_partn_get_version */
ef10_nvram_partn_set_version, /* envo_partn_set_version */
ef10_nvram_buffer_validate, /* envo_buffer_validate */
};
#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
@ -446,6 +449,44 @@ efx_nvram_set_version(
return (rc);
}
/* Validate buffer contents (before writing to flash) */
__checkReturn efx_rc_t
efx_nvram_validate(
__in efx_nic_t *enp,
__in efx_nvram_type_t type,
__in_bcount(partn_size) caddr_t partn_data,
__in size_t partn_size)
{
efx_nvram_ops_t *envop = enp->en_envop;
uint32_t partn;
efx_rc_t rc;
EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE);
EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_NVRAM);
EFSYS_ASSERT3U(type, <, EFX_NVRAM_NTYPES);
if ((rc = envop->envo_type_to_partn(enp, type, &partn)) != 0)
goto fail1;
if (envop->envo_type_to_partn != NULL &&
((rc = envop->envo_buffer_validate(enp, partn,
partn_data, partn_size)) != 0))
goto fail2;
return (0);
fail2:
EFSYS_PROBE(fail2);
fail1:
EFSYS_PROBE1(fail1, efx_rc_t, rc);
return (rc);
}
void
efx_nvram_fini(
__in efx_nic_t *enp)

8
sys/dev/sfxge/common/hunt_impl.h
View File

@ -458,6 +458,14 @@ ef10_nvram_partn_set_version(
__in uint32_t partn,
__in_ecount(4) uint16_t version[4]);
extern __checkReturn efx_rc_t
ef10_nvram_buffer_validate(
__in efx_nic_t *enp,
__in uint32_t partn,
__in_bcount(buffer_size)
caddr_t bufferp,
__in size_t buffer_size);
#endif /* EFSYS_OPT_NVRAM */

2
sys/dev/sfxge/common/hunt_nvram.c
View File

@ -472,7 +472,7 @@ tlv_modify(
/* Validate TLV formatted partition contents (before writing to flash) */
__checkReturn efx_rc_t
efx_nvram_tlv_validate(
ef10_nvram_buffer_validate(
__in efx_nic_t *enp,
__in uint32_t partn,
__in_bcount(partn_size) caddr_t partn_data,