diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-28 12:11:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-29 02:59:33 +0200 |
| commit | af109a2cf6a9a6271fa420ae2d64d72d86c92b7d (patch) | |
| tree | 541012599a12ad8d7eff411a1b567cbd316b07fd /drivers/isdn/capi | |
| parent | sctp: change to save MSG_MORE flag into assoc (diff) | |
| download | linux-af109a2cf6a9a6271fa420ae2d64d72d86c92b7d.tar.xz linux-af109a2cf6a9a6271fa420ae2d64d72d86c92b7d.zip | |
isdn: kcapi: avoid uninitialized data
gcc-7 points out that the AVMB1_ADDCARD ioctl results in an unintialized
value ending up in the cardnr parameter:
drivers/isdn/capi/kcapi.c: In function 'old_capi_manufacturer':
drivers/isdn/capi/kcapi.c:1042:24: error: 'cdef.cardnr' may be used uninitialized in this function [-Werror=maybe-uninitialized]
cparams.cardnr = cdef.cardnr;
This has been broken since before the start of the git history, so
either the value is not used for anything important, or the ioctl
command doesn't get called in practice.
Setting the cardnr to zero avoids the warning and makes sure
we have consistent behavior.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/capi')
| -rw-r--r-- | drivers/isdn/capi/kcapi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index 1dfd1085a04f..9ca691d6c13b 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c @@ -1032,6 +1032,7 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data) sizeof(avmb1_carddef)))) return -EFAULT; cdef.cardtype = AVM_CARDTYPE_B1; + cdef.cardnr = 0; } else { if ((retval = copy_from_user(&cdef, data, sizeof(avmb1_extcarddef)))) |