The patch titled
sctp-fix-sctp_getsockopt_local_addrs_old-to-use-local-storage update
has been added to the -mm tree. Its filename is
sctp-fix-sctp_getsockopt_local_addrs_old-to-use-local-storage-update.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sctp-fix-sctp_getsockopt_local_addrs_old-to-use-local-storage update
From: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Here is an updated patch. bytes_copied got turned into an int everywhere
since that is what the new API expects, so it should be enough for the old
api as well. This also makes the code more consistent.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/sctp/socket.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -puN net/sctp/socket.c~sctp-fix-sctp_getsockopt_local_addrs_old-to-use-local-storage-update net/sctp/socket.c
--- a/net/sctp/socket.c~sctp-fix-sctp_getsockopt_local_addrs_old-to-use-local-storage-update
+++ a/net/sctp/socket.c
@@ -4078,7 +4078,7 @@ done:
*/
static int sctp_copy_laddrs_old(struct sock *sk, __u16 port,
int max_addrs, void *to,
- size_t *bytes_copied)
+ int *bytes_copied)
{
struct list_head *pos, *next;
struct sctp_sockaddr_entry *addr;
@@ -4107,7 +4107,7 @@ static int sctp_copy_laddrs_old(struct s
}
static int sctp_copy_laddrs(struct sock *sk, __u16 port, void *to,
- size_t space_left, size_t *bytes_copied)
+ size_t space_left, int *bytes_copied)
{
struct list_head *pos, *next;
struct sctp_sockaddr_entry *addr;
@@ -4156,7 +4156,7 @@ static int sctp_getsockopt_local_addrs_o
rwlock_t *addr_lock;
int err = 0;
void *addrs;
- size_t bytes_copied = 0;
+ int bytes_copied = 0;
if (len != sizeof(struct sctp_getaddrs_old))
return -EINVAL;
@@ -4185,7 +4185,7 @@ static int sctp_getsockopt_local_addrs_o
to = getaddrs.addrs;
/* Allocate space for a local instance of packed array to hold all
- * the data. We store addresses here first and then copy them
+ * the data. We store addresses here first and then put write them
* to the user in one shot.
*/
addrs = kmalloc(sizeof(union sctp_addr) * getaddrs.addr_num,
@@ -4256,7 +4256,7 @@ static int sctp_getsockopt_local_addrs(s
rwlock_t *addr_lock;
int err = 0;
size_t space_left;
- size_t bytes_copied = 0;
+ int bytes_copied = 0;
void *addrs;
if (len <= sizeof(struct sctp_getaddrs))
_
Patches currently in -mm which might be from vladislav.yasevich@xxxxxx are
git-net.patch
sctp-fix-sctp_getsockopt_local_addrs_old-to-use-local-storage.patch
sctp-fix-sctp_getsockopt_local_addrs_old-to-use-local-storage-update.patch
use-menuconfig-objects-sctp.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
