diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-22 23:21:38 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-22 23:21:38 +0200 |
| commit | 1304a7343b30fc4f16045412efdbb4179a3d9255 (patch) | |
| tree | 83d667ac4f62e30f70305ce4cc7e030e3465f92e /net/atm | |
| parent | team: add support for non-ethernet devices (diff) | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| download | linux-1304a7343b30fc4f16045412efdbb4179a3d9255.tar.xz linux-1304a7343b30fc4f16045412efdbb4179a3d9255.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/common.c | 1 | ||||
| -rw-r--r-- | net/atm/pvc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/atm/common.c b/net/atm/common.c index b4b44dbed645..0c0ad930a632 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -812,6 +812,7 @@ int vcc_getsockopt(struct socket *sock, int level, int optname, if (!vcc->dev || !test_bit(ATM_VF_ADDR, &vcc->flags)) return -ENOTCONN; + memset(&pvc, 0, sizeof(pvc)); pvc.sap_family = AF_ATMPVC; pvc.sap_addr.itf = vcc->dev->number; pvc.sap_addr.vpi = vcc->vpi; diff --git a/net/atm/pvc.c b/net/atm/pvc.c index 3a734919c36c..ae0324021407 100644 --- a/net/atm/pvc.c +++ b/net/atm/pvc.c @@ -95,6 +95,7 @@ static int pvc_getname(struct socket *sock, struct sockaddr *sockaddr, return -ENOTCONN; *sockaddr_len = sizeof(struct sockaddr_atmpvc); addr = (struct sockaddr_atmpvc *)sockaddr; + memset(addr, 0, sizeof(*addr)); addr->sap_family = AF_ATMPVC; addr->sap_addr.itf = vcc->dev->number; addr->sap_addr.vpi = vcc->vpi; |