summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-04-09 10:07:19 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-01 09:41:06 -0700
commit7b806e764b487cf1f348d1e4377f99853935ff7c (patch)
tree9d3c9f73bd315529f9d52903a22f7970179ebd14 /net
parente979f5408b145c0d2b0bf6622952c09a43bcd23a (diff)
downloadlinux-3.10-7b806e764b487cf1f348d1e4377f99853935ff7c.tar.gz
linux-3.10-7b806e764b487cf1f348d1e4377f99853935ff7c.tar.bz2
linux-3.10-7b806e764b487cf1f348d1e4377f99853935ff7c.zip
netrom: fix invalid use of sizeof in nr_recvmsg()
[ Upstream commit c802d759623acbd6e1ee9fbdabae89159a513913 ] sizeof() when applied to a pointer typed expression gives the size of the pointer, not that of the pointed data. Introduced by commit 3ce5ef(netrom: fix info leak via msg_name in nr_recvmsg) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/netrom/af_netrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 72cad6cbcbc..7ed9b1d0c10 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1177,7 +1177,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock,
}
if (sax != NULL) {
- memset(sax, 0, sizeof(sax));
+ memset(sax, 0, sizeof(*sax));
sax->sax25_family = AF_NETROM;
skb_copy_from_linear_data_offset(skb, 7, sax->sax25_call.ax25_call,
AX25_ADDR_LEN);