On Wed, Jan 30, 2019 at 5:15 PM Mattias Jacobsson <2pi@xxxxxx> wrote:
>
> The kernel provides the macro MODULE_DEVICE_TABLE() where driver authors
> can specify their device type and their array of device_ids and thereby
> trigger the generation of the appropriate MODULE_ALIAS() output. This is
> opposed to having to specify one MODULE_ALIAS() for each device. The WMI
> device type is currently not supported.
>
> While using MODULE_DEVICE_TABLE() does increase the complexity as well
> as spreading out the implementation across the kernel, it does come with
> some benefits too;
> * It makes different drivers look more similar; if you can specify the
> array of device_ids any device type specific input to MODULE_ALIAS()
> will automatically be generated for you.
> * It helps each driver avoid keeping multiple versions of the same
> information in sync. That is, both the array of device_ids and the
> potential multitude of MODULE_ALIAS()'s.
>
> Add WMI support to MODULE_DEVICE_TABLE() by adding info about struct
> wmi_device_id in devicetable-offsets.c and add a WMI entry point in
> file2alias.c.
>
> The type argument for MODULE_DEVICE_TABLE(type, name) is wmi.
>
> Suggested-by: Pali Rohár <pali.rohar@xxxxxxxxx>
> Signed-off-by: Mattias Jacobsson <2pi@xxxxxx>
> ---
>
> What do you think about this usage of snprintf()? Now we check if there
> is an error or if the printed string tried to exceeded the buffer.
> Ideally 500 should be a macro or a parameter, but there isn't one
> available. The number 500 comes from a few lines below in the function
> do_table().
This looks better, though minor comments.
Indeed, 500 would be nicer to be defined as a constant (via preprocessor macro).
> +/* Looks like: wmi:guid */
> +static int do_wmi_entry(const char *filename, void *symval, char *alias)
> +{
> + DEF_FIELD_ADDR(symval, wmi_device_id, guid_string);
> + if (strlen(*guid_string) != UUID_STRING_LEN) {
> + warn("Invalid WMI device id 'wmi:%s' in '%s'\n",
> + *guid_string, filename);
> + return 0;
> + }
> +
> + int len = snprintf(alias, 500, WMI_MODULE_PREFIX "%s", *guid_string);
Please, split declaration and assignment...
> +
...and drop this line.
> + if (len < 0 || len >= 500) {
Would it even possible to get a negative number here?
Same for any other number than slightly bigger than 36.
You have above a check and here is the matter of either sudden
replacement of the string during the operation or how snprintf is
broken itself.
Do you have a case in mind which can bring to the above conditions?
> + warn("Could not generate all MODULE_ALIAS's in '%s'\n",
> + filename);
> + return 0;
> + }
On top of that you have an ordinary case here and in similar ones we
don't care about buffer size at all (perhaps BUILD_BUG_ON() what is
needed here).
So, what about simple
{
DEF_FIELD_ADDR(...);
size_t len;
len = strlen(*guid_string);
if (len != ...) {
...
}
sprintf(...);
return 1;
}
?
> + return 1;
> +}
> +
> /* Does namelen bytes of name exactly match the symbol? */
> static bool sym_is(const char *name, unsigned namelen, const char *symbol)
> {
> @@ -1357,6 +1378,7 @@ static const struct devtable devtable[] = {
> {"fslmc", SIZE_fsl_mc_device_id, do_fsl_mc_entry},
> {"tbsvc", SIZE_tb_service_id, do_tbsvc_entry},
> {"typec", SIZE_typec_device_id, do_typec_entry},
> + {"wmi", SIZE_wmi_device_id, do_wmi_entry},
> };
>
> /* Create MODULE_ALIAS() statements.
> --
> 2.20.1
>
--
With Best Regards,
Andy Shevchenko
