cnic: ensure ulp_type is not negative
Subsystems (2)
PATCH 1/1 cnic: ensure ulp_type is not negative
`ulp_type' is signed, make sure it is not negative when we read the array element.
Signed-off-by Roel Kluin <[email protected]>
--- drivers/net/cnic.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/cnic.c +4 -4
@@ -347,7 +347,7 @@ int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops) {struct cnic_dev *dev; -if (ulp_type >=MAX_CNIC_ULP_TYPE ) { +if (ulp_type <0 || ulp_type >=MAX_CNIC_ULP_TYPE ) { printk(KERN_ERR PFX "cnic_register_driver: Bad type %d\n", ulp_type);return -EINVAL ;
@@ -393,7 +393,7 @@ int cnic_unregister_driver(int ulp_type)struct cnic_ulp_ops *ulp_ops;int i =0 ; -if (ulp_type >=MAX_CNIC_ULP_TYPE ) { +if (ulp_type <0 || ulp_type >=MAX_CNIC_ULP_TYPE ) { printk(KERN_ERR PFX "cnic_unregister_driver: Bad type %d\n", ulp_type);return -EINVAL ;
@@ -449,7 +449,7 @@ static int cnic_register_device(struct cnic_dev *dev, int ulp_type,struct cnic_local *cp = dev->cnic_priv;struct cnic_ulp_ops *ulp_ops; -if (ulp_type >=MAX_CNIC_ULP_TYPE ) { +if (ulp_type <0 || ulp_type >=MAX_CNIC_ULP_TYPE ) { printk(KERN_ERR PFX "cnic_register_device: Bad type %d\n", ulp_type);return -EINVAL ;
@@ -490,7 +490,7 @@ static int cnic_unregister_device(struct cnic_dev *dev, int ulp_type)struct cnic_local *cp = dev->cnic_priv;int i =0 ; -if (ulp_type >=MAX_CNIC_ULP_TYPE ) { +if (ulp_type <0 || ulp_type >=MAX_CNIC_ULP_TYPE ) { printk(KERN_ERR PFX "cnic_unregister_device: Bad type %d\n", ulp_type);return -EINVAL ;
Quoted 4 lines · Roel Kluin
`ulp_type' is signed, make sure it is not negative when we read the array element.
Signed-off-by Roel Kluin <[email protected]>
Looks good to me. Thanks.
Acked-by Michael Chan <[email protected]>
Quoted 45 lines
--- drivers/net/cnic.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)drivers/net/cnic.c +4
-4@@ -347,7 +347,7 @@ int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops) {struct cnic_dev *dev; -if (ulp_type >=MAX_CNIC_ULP_TYPE ) { +if (ulp_type <0 || ulp_type >=MAX_CNIC_ULP_TYPE ) { printk(KERN_ERR PFX "cnic_register_driver: Bad type %d\n", ulp_type);return -EINVAL ;@@ -393,7 +393,7 @@ int cnic_unregister_driver(int ulp_type)struct cnic_ulp_ops *ulp_ops;int i =0 ; -if (ulp_type >=MAX_CNIC_ULP_TYPE ) { +if (ulp_type <0 || ulp_type >=MAX_CNIC_ULP_TYPE ) { printk(KERN_ERR PFX "cnic_unregister_driver: Bad type %d\n", ulp_type);return -EINVAL ;@@ -449,7 +449,7 @@ static int cnic_register_device(struct cnic_dev *dev, int ulp_type,struct cnic_local *cp = dev->cnic_priv;struct cnic_ulp_ops *ulp_ops; -if (ulp_type >=MAX_CNIC_ULP_TYPE ) { +if (ulp_type <0 || ulp_type >=MAX_CNIC_ULP_TYPE ) { printk(KERN_ERR PFX "cnic_register_device: Bad type %d\n", ulp_type);return -EINVAL ;@@ -490,7 +490,7 @@ static int cnic_unregister_device(struct cnic_dev *dev, int ulp_type)struct cnic_local *cp = dev->cnic_priv;int i =0 ; -if (ulp_type >=MAX_CNIC_ULP_TYPE ) { +if (ulp_type <0 || ulp_type >=MAX_CNIC_ULP_TYPE ) { printk(KERN_ERR PFX "cnic_unregister_device: Bad type %d\n", ulp_type);return -EINVAL ;
From: "Michael Chan" <[email protected]>
Date: Mon, 2 Nov 2009 09:56:59 -0800
Quoted 9 lines · Roel Kluin
Quoted 4 lines
`ulp_type' is signed, make sure it is not negative when we read the array element.
Signed-off-by Roel Kluin <[email protected]>Looks good to me. Thanks.
Acked-by Michael Chan <[email protected]>
Applied to net-next-2.6