From: Stephen Hemminger <shemminger@osdl.org>
To: "David S. Miller" <davem@redhat.com>,
Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Cc: netdev@oss.sgi.com
Subject: [PATCH] (8/17) ipx -- size_t for send/recvmsg
Date: Fri, 9 Jan 2004 14:02:23 -0800 [thread overview]
Message-ID: <20040109140223.3926cbeb@linux.local> (raw)
Convert IPX to unsigned for send/receive message length.
Enforce MTU limited by header pktsize.
diff -Nru a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
--- a/net/ipx/af_ipx.c Mon Dec 8 16:19:52 2003
+++ b/net/ipx/af_ipx.c Mon Dec 8 16:19:52 2003
@@ -1683,7 +1683,7 @@
}
static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
- struct msghdr *msg, int len)
+ struct msghdr *msg, size_t len)
{
struct sock *sk = sock->sk;
struct ipx_opt *ipxs = ipx_sk(sk);
@@ -1698,6 +1698,10 @@
if (flags & ~MSG_DONTWAIT)
goto out;
+ /* Max possible packet size limited by 16 bit pktsize in header */
+ if (len >= 65535 - sizeof(struct ipxhdr))
+ goto out;
+
if (usipx) {
if (!ipxs->port) {
struct sockaddr_ipx uaddr;
@@ -1744,7 +1748,7 @@
static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,
- struct msghdr *msg, int size, int flags)
+ struct msghdr *msg, size_t size, int flags)
{
struct sock *sk = sock->sk;
struct ipx_opt *ipxs = ipx_sk(sk);
diff -Nru a/net/ipx/ipx_route.c b/net/ipx/ipx_route.c
--- a/net/ipx/ipx_route.c Mon Dec 8 16:19:52 2003
+++ b/net/ipx/ipx_route.c Mon Dec 8 16:19:52 2003
@@ -169,13 +169,13 @@
* Route an outgoing frame from a socket.
*/
int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx,
- struct iovec *iov, int len, int noblock)
+ struct iovec *iov, size_t len, int noblock)
{
struct sk_buff *skb;
struct ipx_opt *ipxs = ipx_sk(sk);
struct ipx_interface *intrfc;
struct ipxhdr *ipx;
- int size;
+ size_t size;
int ipx_offset;
struct ipx_route *rt = NULL;
int rc;
next reply other threads:[~2004-01-09 22:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-01-09 22:02 Stephen Hemminger [this message]
2004-01-08 22:17 ` [PATCH] (8/17) ipx -- size_t for send/recvmsg Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040109140223.3926cbeb@linux.local \
--to=shemminger@osdl.org \
--cc=acme@conectiva.com.br \
--cc=davem@redhat.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.