This patch replaces kzalloc with kcalloc when using
arrays. kcalloc is better suited for arrays because
it has overflow protection.

Reported-by: Dan Carpenter <dan.carpen...@oracle.com>
Signed-off-by: Lidza Louina <lidza.lou...@gmail.com>
---
 drivers/staging/dgnc/dgnc_tty.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c
index 07b79be..18705f9 100644
--- a/drivers/staging/dgnc/dgnc_tty.c
+++ b/drivers/staging/dgnc/dgnc_tty.c
@@ -222,12 +222,12 @@ int dgnc_tty_register(struct dgnc_board *brd)
         * The kernel wants space to store pointers to
         * tty_struct's and termios's.
         */
-       brd->SerialDriver.ttys = kzalloc(brd->maxports * 
sizeof(*brd->SerialDriver.ttys), GFP_KERNEL);
+       brd->SerialDriver.ttys = kcalloc(brd->SerialDriver.num, brd->maxports * 
sizeof(*brd->SerialDriver.ttys), GFP_KERNEL);
        if (!brd->SerialDriver.ttys)
                return -ENOMEM;
 
        kref_init(&brd->SerialDriver.kref);
-       brd->SerialDriver.termios = kzalloc(brd->maxports * 
sizeof(*brd->SerialDriver.termios), GFP_KERNEL);
+       brd->SerialDriver.termios = kcalloc(brd->SerialDriver.num, 
brd->maxports * sizeof(*brd->SerialDriver.termios), GFP_KERNEL);
        if (!brd->SerialDriver.termios)
                return -ENOMEM;
 
@@ -271,11 +271,11 @@ int dgnc_tty_register(struct dgnc_board *brd)
         * tty_struct's and termios's.  Must be seperate from
         * the Serial Driver so we don't get confused
         */
-       brd->PrintDriver.ttys = kzalloc(brd->maxports * 
sizeof(*brd->PrintDriver.ttys), GFP_KERNEL);
+       brd->PrintDriver.ttys = kcalloc(brd->PrintDriver.num, brd->maxports * 
sizeof(*brd->PrintDriver.ttys), GFP_KERNEL);
        if (!brd->PrintDriver.ttys)
                return -ENOMEM;
        kref_init(&brd->PrintDriver.kref);
-       brd->PrintDriver.termios = kzalloc(brd->maxports * 
sizeof(*brd->PrintDriver.termios), GFP_KERNEL);
+       brd->PrintDriver.termios = kcalloc(brd->PrintDriver.num, brd->maxports 
* sizeof(*brd->PrintDriver.termios), GFP_KERNEL);
        if (!brd->PrintDriver.termios)
                return -ENOMEM;
 
-- 
1.8.1.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to