diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-10-09 14:18:20 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-17 14:10:10 -0700 |
| commit | 178e485a0ebbfdb7165b4363d8fea2a07d650c0b (patch) | |
| tree | ff94d339f1dac78e5ab4236cb0bd56ec85516dfa | |
| parent | d7c4660c12adc5c66351253af381259686fa08a4 (diff) | |
| download | linux-3.10-178e485a0ebbfdb7165b4363d8fea2a07d650c0b.tar.gz linux-3.10-178e485a0ebbfdb7165b4363d8fea2a07d650c0b.tar.bz2 linux-3.10-178e485a0ebbfdb7165b4363d8fea2a07d650c0b.zip | |
staging: dgrp: check return value of alloc_tty_driver
alloc_tty_driver was always assumed to succeed. Add code to check the
return value and return -ENOMEM if alloc_tty_driver fails.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/dgrp/dgrp_tty.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/staging/dgrp/dgrp_tty.c b/drivers/staging/dgrp/dgrp_tty.c index 72f6fcfa987..e125b03598d 100644 --- a/drivers/staging/dgrp/dgrp_tty.c +++ b/drivers/staging/dgrp/dgrp_tty.c @@ -3173,6 +3173,9 @@ dgrp_tty_init(struct nd_struct *nd) */ nd->nd_serial_ttdriver = alloc_tty_driver(CHAN_MAX); + if (!nd->nd_serial_ttdriver) + return -ENOMEM; + sprintf(nd->nd_serial_name, "tty_dgrp_%s_", id); nd->nd_serial_ttdriver->owner = THIS_MODULE; @@ -3232,6 +3235,9 @@ dgrp_tty_init(struct nd_struct *nd) } nd->nd_callout_ttdriver = alloc_tty_driver(CHAN_MAX); + if (!nd->nd_callout_ttdriver) + return -ENOMEM; + sprintf(nd->nd_callout_name, "cu_dgrp_%s_", id); nd->nd_callout_ttdriver->owner = THIS_MODULE; @@ -3269,6 +3275,9 @@ dgrp_tty_init(struct nd_struct *nd) nd->nd_xprint_ttdriver = alloc_tty_driver(CHAN_MAX); + if (!nd->nd_xprint_ttdriver) + return -ENOMEM; + sprintf(nd->nd_xprint_name, "pr_dgrp_%s_", id); nd->nd_xprint_ttdriver->owner = THIS_MODULE; |