| Message ID | 1400347180-25553-1-git-send-email-rickard_strandqvist@spectrumdigital.se |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Date: Sat, 17 May 2014 19:19:40 +0200 > @@ -2064,8 +2064,12 @@ static int l3ni1_cmd_global(struct PStack *st, isdn_ctrl *ic) > { 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 */ > + > + if (pc) > + { > + pc->prot.ni1.ll_id = ic->parm.ni1_io.ll_id; /* remember id */ > + pc->prot.ni1.proc = ic->parm.ni1_io.proc; /* and procedure */ > + } Like I said for your other patch, you should fix this by putting these assignments in the timeout > 0 code block. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c index 0df6691..367b9d6 100644 --- a/drivers/isdn/hisax/l3ni1.c +++ b/drivers/isdn/hisax/l3ni1.c @@ -2064,8 +2064,12 @@ static int l3ni1_cmd_global(struct PStack *st, isdn_ctrl *ic) { 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 */ + + if (pc) + { + pc->prot.ni1.ll_id = ic->parm.ni1_io.ll_id; /* remember id */ + pc->prot.ni1.proc = ic->parm.ni1_io.proc; /* and procedure */ + } if (!(skb = l3_alloc_skb(l))) { free_invoke_id(st, id);
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> --- drivers/isdn/hisax/l3ni1.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)