diff options
| author | Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> | 2014-07-06 14:04:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-09 01:06:21 +0200 |
| commit | 85b722d760f0de77c4bb371b77202784671f5a54 (patch) | |
| tree | 182d0ebd035a918ecca3b952ad436bfa79543220 /drivers/isdn | |
| parent | tipc: fix bug in multicast/broadcast message reassembly (diff) | |
| download | linux-85b722d760f0de77c4bb371b77202784671f5a54.tar.xz linux-85b722d760f0de77c4bb371b77202784671f5a54.zip | |
isdn: hisax: l3ni1.c: Fix for possible null pointer dereference
There is otherwise a risk of a possible null pointer dereference.
Was largely found by using a static code analysis program called cppcheck.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/hisax/l3ni1.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c index 0df6691d045c..8dc791bfaa6f 100644 --- a/drivers/isdn/hisax/l3ni1.c +++ b/drivers/isdn/hisax/l3ni1.c @@ -2059,13 +2059,17 @@ static int l3ni1_cmd_global(struct PStack *st, isdn_ctrl *ic) memcpy(p, ic->parm.ni1_io.data, ic->parm.ni1_io.datalen); /* copy data */ l = (p - temp) + ic->parm.ni1_io.datalen; /* total length */ - if (ic->parm.ni1_io.timeout > 0) - if (!(pc = ni1_new_l3_process(st, -1))) - { free_invoke_id(st, id); + if (ic->parm.ni1_io.timeout > 0) { + pc = ni1_new_l3_process(st, -1); + if (!pc) { + free_invoke_id(st, id); return (-2); } - pc->prot.ni1.ll_id = ic->parm.ni1_io.ll_id; /* remember id */ - pc->prot.ni1.proc = ic->parm.ni1_io.proc; /* and procedure */ + /* remember id */ + pc->prot.ni1.ll_id = ic->parm.ni1_io.ll_id; + /* and procedure */ + pc->prot.ni1.proc = ic->parm.ni1_io.proc; + } if (!(skb = l3_alloc_skb(l))) { free_invoke_id(st, id); |