diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-26 15:21:31 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-26 15:21:31 -0500 |
| commit | 25202fe3cf8722b1f81bb83e40df136c720c8a22 (patch) | |
| tree | 9a23dec721e1837a175277d2ff399cef51f73216 | |
| parent | 9a17bea44f336f738a74e1768cf1d93790d2c773 (diff) | |
| download | kernel-25202fe3cf8722b1f81bb83e40df136c720c8a22.tar.gz kernel-25202fe3cf8722b1f81bb83e40df136c720c8a22.tar.xz kernel-25202fe3cf8722b1f81bb83e40df136c720c8a22.zip | |
quiet a build warning the previous INET_DIAG change caused
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | netlink-make-nlmsg_find_attr-take-a-const-ptr.patch | 29 |
2 files changed, 34 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index e8e3109f0..72152fb9f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -737,6 +737,7 @@ Patch12400: ipc-zero-struct-memory-for-compat-fns.patch Patch12401: ipc-shm-fix-information-leak-to-user.patch Patch12405: inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch +Patch12408: netlink-make-nlmsg_find_attr-take-a-const-ptr.patch Patch12406: posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch @@ -1380,6 +1381,7 @@ ApplyPatch ipc-shm-fix-information-leak-to-user.patch # rhbz#651264 (CVE-2010-3880) ApplyPatch inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch +ApplyPatch netlink-make-nlmsg_find_attr-take-a-const-ptr.patch # rhbz#656264 ApplyPatch posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch @@ -2005,6 +2007,9 @@ fi %changelog * Fri Nov 26 2010 Kyle McMartin <kyle@redhat.com> +- Quiet a build warning the previous INET_DIAG fix caused. + +* Fri Nov 26 2010 Kyle McMartin <kyle@redhat.com> - Plug stack leaks in tty/serial drivers. (#648663, #648660) * Fri Nov 26 2010 Kyle McMartin <kyle@redhat.com> diff --git a/netlink-make-nlmsg_find_attr-take-a-const-ptr.patch b/netlink-make-nlmsg_find_attr-take-a-const-ptr.patch new file mode 100644 index 000000000..5b75ca400 --- /dev/null +++ b/netlink-make-nlmsg_find_attr-take-a-const-ptr.patch @@ -0,0 +1,29 @@ +From 38f1f0db010ac5b981ae06f1fe2fd64095ebb171 Mon Sep 17 00:00:00 2001 +From: Nelson Elhage <nelhage@ksplice.com> +Date: Wed, 3 Nov 2010 16:35:40 +0000 +Subject: [PATCH] netlink: Make nlmsg_find_attr take a const nlmsghdr*. + +This will let us use it on a nlmsghdr stored inside a netlink_callback. + +Signed-off-by: Nelson Elhage <nelhage@ksplice.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + include/net/netlink.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/net/netlink.h b/include/net/netlink.h +index a63b219..c344646 100644 +--- a/include/net/netlink.h ++++ b/include/net/netlink.h +@@ -384,7 +384,7 @@ static inline int nlmsg_parse(const struct nlmsghdr *nlh, int hdrlen, + * + * Returns the first attribute which matches the specified type. + */ +-static inline struct nlattr *nlmsg_find_attr(struct nlmsghdr *nlh, ++static inline struct nlattr *nlmsg_find_attr(const struct nlmsghdr *nlh, + int hdrlen, int attrtype) + { + return nla_find(nlmsg_attrdata(nlh, hdrlen), +-- +1.7.3.2 + |