[PATCH] defxx: Fix a sentinel at the end of a 'eisa_device_id' structure

[PATCH] defxx: Fix a sentinel at the end of a 'eisa_device_id' structure

[Christophe JAILLET]

'struct eisa_device_id' must be ended by an empty string, not a NULL
pointer. Otherwise, a NULL pointer dereference may occur in
'eisa_bus_match()'.

Also convert some spaces to tab to please 'checkpatch.pl'.

Fixes: e89a2cfb7d7b ("[TC] defxx: TURBOchannel support")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/net/fddi/defxx.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 077c68498f04..7ef0c57f07c6 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -3768,11 +3768,11 @@ static void dfx_pci_unregister(struct pci_dev *pdev)
 
 #ifdef CONFIG_EISA
 static const struct eisa_device_id dfx_eisa_table[] = {
-        { "DEC3001", DEFEA_PROD_ID_1 },
-        { "DEC3002", DEFEA_PROD_ID_2 },
-        { "DEC3003", DEFEA_PROD_ID_3 },
-        { "DEC3004", DEFEA_PROD_ID_4 },
-        { }
+	{ "DEC3001", DEFEA_PROD_ID_1 },
+	{ "DEC3002", DEFEA_PROD_ID_2 },
+	{ "DEC3003", DEFEA_PROD_ID_3 },
+	{ "DEC3004", DEFEA_PROD_ID_4 },
+	{ "" }
 };
 MODULE_DEVICE_TABLE(eisa, dfx_eisa_table);
 
-- 
2.20.1

Re: [PATCH] defxx: Fix a sentinel at the end of a 'eisa_device_id' structure

[Maciej W. Rozycki]

On Sun, 2 Feb 2020, Christophe JAILLET wrote:

> 'struct eisa_device_id' must be ended by an empty string, not a NULL
> pointer. Otherwise, a NULL pointer dereference may occur in
> 'eisa_bus_match()'.

 Umm, that's weird code there in `eisa_bus_match' (I do hope at least GCC 
optimises the `strlen' away nowadays and checks for the character pointed 
being null instead), but as usually with old stuff let's keep changes to 
the minimum.  So:

Acked-by: Maciej W. Rozycki <macro@linux-mips.org>

 Thanks for the fix!

  Maciej

Re: [PATCH] defxx: Fix a sentinel at the end of a 'eisa_device_id' structure

[Dan Carpenter]

On Sun, Feb 02, 2020 at 03:23:41PM +0100, Christophe JAILLET wrote:
> 'struct eisa_device_id' must be ended by an empty string, not a NULL
> pointer. Otherwise, a NULL pointer dereference may occur in
> 'eisa_bus_match()'.
> 
> Also convert some spaces to tab to please 'checkpatch.pl'.
> 
> Fixes: e89a2cfb7d7b ("[TC] defxx: TURBOchannel support")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/net/fddi/defxx.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
> index 077c68498f04..7ef0c57f07c6 100644
> --- a/drivers/net/fddi/defxx.c
> +++ b/drivers/net/fddi/defxx.c
> @@ -3768,11 +3768,11 @@ static void dfx_pci_unregister(struct pci_dev *pdev)
>  
>  #ifdef CONFIG_EISA
>  static const struct eisa_device_id dfx_eisa_table[] = {
> -        { "DEC3001", DEFEA_PROD_ID_1 },
> -        { "DEC3002", DEFEA_PROD_ID_2 },
> -        { "DEC3003", DEFEA_PROD_ID_3 },
> -        { "DEC3004", DEFEA_PROD_ID_4 },
> -        { }
> +	{ "DEC3001", DEFEA_PROD_ID_1 },
> +	{ "DEC3002", DEFEA_PROD_ID_2 },
> +	{ "DEC3003", DEFEA_PROD_ID_3 },
> +	{ "DEC3004", DEFEA_PROD_ID_4 },
> +	{ "" }

You haven't changed runtime at all.  :P (struct eisa_device_id)->sig[]
is an array, not a pointer.  There is no NULL dereference because an
array in the middle of another array can't be NULL.

regards,
dan carpenter

Re: [PATCH] defxx: Fix a sentinel at the end of a 'eisa_device_id' structure

[Maciej W. Rozycki]

On Mon, 3 Feb 2020, Dan Carpenter wrote:

> > diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
> > index 077c68498f04..7ef0c57f07c6 100644
> > --- a/drivers/net/fddi/defxx.c
> > +++ b/drivers/net/fddi/defxx.c
> > @@ -3768,11 +3768,11 @@ static void dfx_pci_unregister(struct pci_dev *pdev)
> >  
> >  #ifdef CONFIG_EISA
> >  static const struct eisa_device_id dfx_eisa_table[] = {
> > -        { "DEC3001", DEFEA_PROD_ID_1 },
> > -        { "DEC3002", DEFEA_PROD_ID_2 },
> > -        { "DEC3003", DEFEA_PROD_ID_3 },
> > -        { "DEC3004", DEFEA_PROD_ID_4 },
> > -        { }
> > +	{ "DEC3001", DEFEA_PROD_ID_1 },
> > +	{ "DEC3002", DEFEA_PROD_ID_2 },
> > +	{ "DEC3003", DEFEA_PROD_ID_3 },
> > +	{ "DEC3004", DEFEA_PROD_ID_4 },
> > +	{ "" }
> 
> You haven't changed runtime at all.  :P (struct eisa_device_id)->sig[]
> is an array, not a pointer.  There is no NULL dereference because an
> array in the middle of another array can't be NULL.

 Right, the code is good as it stands (I should have more faith in my past 
achievements ;) ).  Except for the whitespace issue, which I suppose might 
not be worth bothering to fix.  Thanks for your meticulousness!

  Maciej

Re: [PATCH] defxx: Fix a sentinel at the end of a 'eisa_device_id' structure

[Jakub Kicinski]

On Mon, 3 Feb 2020 10:20:46 +0000 (GMT), Maciej W. Rozycki wrote:
>  Right, the code is good as it stands (I should have more faith in my past 
> achievements ;) ).  Except for the whitespace issue, which I suppose might 
> not be worth bothering to fix.  Thanks for your meticulousness!

For the white space clean up please resend after the merge window
(if you care), networking trees are only taking fixes fixes now :)