Attachment 302153 Details for Bug 441559 – tested nlm patch

[patch] tested nlm patch

lockd-nsmif.patch (text/plain), 3.01 KB, created by Janne Karhunen on 2008-04-11 18:14:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Janne Karhunen

Created: 2008-04-11 18:14:54 UTC

Size: 3.01 KB

patch

obsolete

>diff -Naurp lockd.org/svc4proc.c lockd/svc4proc.c
>--- lockd.org/svc4proc.c	2008-04-10 17:26:51.000000000 +0300
>+++ lockd/svc4proc.c	2008-04-11 20:31:50.295454000 +0300
>@@ -24,6 +24,8 @@
> static u32	nlm4svc_callback(struct svc_rqst *, u32, struct nlm_res *);
> static void	nlm4svc_callback_exit(struct rpc_task *);
> 
>+extern unsigned int nlm_nsm_interface;
>+
> /*
>  * Obtain client and file from arguments
>  */
>@@ -426,8 +428,9 @@ nlm4svc_proc_sm_notify(struct svc_rqst *
> 	struct nlm_host		*host;
> 
> 	dprintk("lockd: SM_NOTIFY     called\n");
>-	if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)
>-	 || ntohs(saddr.sin_port) >= 1024) {
>+        if (((saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK))
>+         && (nlm_nsm_interface && (saddr.sin_addr.s_addr != htonl(nlm_nsm_interface))))
>+         || (ntohs(saddr.sin_port) >= 1024)) {
> 		printk(KERN_WARNING
> 			"lockd: rejected NSM callback from %08x:%d\n",
> 			ntohl(rqstp->rq_addr.sin_addr.s_addr),
>diff -Naurp lockd.org/svc.c lockd/svc.c
>--- lockd.org/svc.c	2008-04-10 17:26:51.000000000 +0300
>+++ lockd/svc.c	2008-04-11 20:31:14.680108000 +0300
>@@ -56,6 +56,7 @@ static DECLARE_WAIT_QUEUE_HEAD(lockd_exi
> static unsigned long		nlm_grace_period;
> static unsigned long		nlm_timeout = LOCKD_DFLT_TIMEO;
> static int			nlm_udpport, nlm_tcpport;
>+unsigned int 			nlm_nsm_interface = 0;
> 
> /*
>  * Constants needed for the sysctl interface.
>@@ -86,6 +87,7 @@ static inline void clear_grace_period(vo
> {
> 	nlmsvc_grace_period = 0;
> }
>+
> int
> nlmsvc_dispatch(struct svc_rqst *rqstp, u32 *statp)
> {
>@@ -417,6 +419,16 @@ static ctl_table nlm_sysctls[] = {
> 		.extra1		= (int *) &nlm_port_min,
> 		.extra2		= (int *) &nlm_port_max,
> 	},
>+        {
>+                .ctl_name       = CTL_UNNUMBERED,
>+                .procname       = "nlm_nsm_interface",
>+                .data           = &nlm_nsm_interface,
>+                .maxlen         = sizeof(unsigned int),
>+                .mode           = 0644,
>+                .proc_handler   = &proc_dointvec,
>+                .extra1         = 0,
>+                .extra2         = 0,
>+        },
> 	{ .ctl_name = 0 }
> };
> 
>diff -Naurp lockd.org/svcproc.c lockd/svcproc.c
>--- lockd.org/svcproc.c	2008-04-10 17:26:51.000000000 +0300
>+++ lockd/svcproc.c	2008-04-11 20:16:27.509163000 +0300
>@@ -25,6 +25,8 @@
> static u32	nlmsvc_callback(struct svc_rqst *, u32, struct nlm_res *);
> static void	nlmsvc_callback_exit(struct rpc_task *);
> 
>+extern unsigned int nlm_nsm_interface;
>+
> #ifdef CONFIG_LOCKD_V4
> static u32
> cast_to_nlm(u32 status, u32 vers)
>@@ -450,8 +452,9 @@ nlmsvc_proc_sm_notify(struct svc_rqst *r
> 	struct nlm_host		*host;
> 
> 	dprintk("lockd: SM_NOTIFY     called\n");
>-	if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)
>-	 || ntohs(saddr.sin_port) >= 1024) {
>+        if (((saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK))
>+         && (nlm_nsm_interface && (saddr.sin_addr.s_addr != htonl(nlm_nsm_interface))))
>+         || (ntohs(saddr.sin_port) >= 1024)) {
> 		printk(KERN_WARNING
> 			"lockd: rejected NSM callback from %08x:%d\n",
> 			ntohl(rqstp->rq_addr.sin_addr.s_addr),

Actions: View | Diff

Attachments on bug 441559: 302005 | 302006 | 302152 | 302153 | 304538 | 309071