| From bef41eeabe2f888ff26e05497b78574a6ab4d906 Mon Sep 17 00:00:00 2001 |
| From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> |
| Date: Tue, 9 Apr 2013 10:07:19 +0800 |
| Subject: netrom: fix invalid use of sizeof in nr_recvmsg() |
| |
| |
| From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> |
| |
| [ 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> |
| --- |
| net/netrom/af_netrom.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/netrom/af_netrom.c |
| +++ b/net/netrom/af_netrom.c |
| @@ -1177,7 +1177,7 @@ static int nr_recvmsg(struct kiocb *iocb |
| } |
| |
| 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); |
