Re: [PATCH] depmod: warn on invalid devname specification

[Lucas De Marchi]

Hi Tom,

On Mon, Sep 9, 2013 at 3:01 PM, Tom Gundersen <teg@xxxxxxx> wrote:
> During the last merge window (3.12) a couple of modules gained devname
> aliases, but without the necessary major and minor information. These were
> then silently ignored when generating modules.devname.
>
> Complain loudly to avoid such errors sneaking in undetected in the future:
>
>     depmod: ERROR: Module 'zram' has devname (zram) but lacks major and minor information. Ignoring.
>     depmod: ERROR: Module 'uhid' has devname (uhid) but lacks major and minor information. Ignoring.
>
> Cc: Kay Sievers <kay@xxxxxxxx>
> Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxxxxxxx>
> ---
>  tools/depmod.c | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/tools/depmod.c b/tools/depmod.c
> index 985cf3a..5855b2a 100644
> --- a/tools/depmod.c
> +++ b/tools/depmod.c
> @@ -2120,11 +2120,18 @@ static int output_devname(struct depmod *depmod, FILE *out)
>                                 minor = min;
>                         }
>
> -                       if (type != '\0' && devname != NULL) {
> +                       if (type != '\0' && devname != NULL)
> +                               break;
> +               }
> +
> +               if (devname != NULL) {
> +                       if (type != '\0')
>                                 fprintf(out, "%s %s %c%u:%u\n", mod->modname,
>                                         devname, type, major, minor);
> -                               break;
> -                       }
> +                       else
> +                               ERR("Module '%s' has devname (%s) but "
> +                                   "lacks major and minor information. "
> +                                   "Ignoring.\n", mod->modname, devname);
>                 }
>         }
>
> --

Patch has been applied. Thanks.

Lucas De Marchi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/