diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-26 18:36:51 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-26 18:36:51 (GMT) |
| commit | f19e6c69390251efa549ff07c863e09b94b81537 (patch) | |
| tree | 3aebd43b979f9ae4ee7bea2856c6a5876173475e /drivers/staging/tidspbridge/pmgr/dbll.c | |
| parent | 05e4cb7c25c1ac35a6a61c79ad40cf69dd3538bf (diff) | |
| parent | 81b884c9dfe6753a78df0cbf4e96f095d718bd95 (diff) | |
| download | linux-fsl-qoriq-f19e6c69390251efa549ff07c863e09b94b81537.tar.xz | |
Merge tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH:
"Here are some tiny drivers/staging/ fixes for 3.11-rc3
A number of bugfixes, all pretty tiny, but resolve issues that have
been reported (the kstrtos32 change fixes a data corruption problem
that Dan found). And a MAINTAINERS file update for the comedi
drivers"
* tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
MAINTAINERS: Update the list of maintainers for staging/comedi driver.
staging: tidspbridge: replace strict_strtol() with kstrtos32()
staging: android: logger: Correct write offset reset on error
staging: zram: protect zram_reset_device() call
staging: gdm72xx: potential use after free in send_qos_list()
staging: drm/imx: drop "select OF_VIDEOMODE"
staging: frontier: use after free in disconnect()
staging: comedi: fix a race between do_cmd_ioctl() and read/write
staging: comedi: COMEDI_CANCEL ioctl should wake up read/write
Diffstat (limited to 'drivers/staging/tidspbridge/pmgr/dbll.c')
| -rw-r--r-- | drivers/staging/tidspbridge/pmgr/dbll.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c index c191ae2..41e88ab 100644 --- a/drivers/staging/tidspbridge/pmgr/dbll.c +++ b/drivers/staging/tidspbridge/pmgr/dbll.c @@ -1120,8 +1120,11 @@ static int dbll_rmm_alloc(struct dynamic_loader_allocate *this, or DYN_EXTERNAL, then mem granularity information is present within the section name - only process if there are at least three tokens within the section name (just a minor optimization) */ - if (count >= 3) - strict_strtol(sz_last_token, 10, (long *)&req); + if (count >= 3) { + status = kstrtos32(sz_last_token, 10, &req); + if (status) + goto func_cont; + } if ((req == 0) || (req == 1)) { if (strcmp(sz_sec_last_token, "DYN_DARAM") == 0) { |