Attachment 601505 Details for Bug 566717 – Upstream fix ported to quota 3.13

[patch] Upstream fix ported to quota 3.13

quota-3.13-goodclient.patch (text/plain), 2.00 KB, created by Petr Pisar on 2012-07-31 11:20:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2012-07-31 11:20:27 UTC

Size: 2.00 KB

patch

obsolete

>From b7eee596fcc10d02c14cbdda050c5d083a96f037 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
>Date: Tue, 31 Jul 2012 09:51:23 +0200
>Subject: [PATCH] Upstream fix for CVE-2012-3417 ported to quota-3.13
>
>commit 0abbfe92536fa5854eb65572de0cf131f80e2387
>Author: jkar8572 <jkar8572>
>Date:   Tue Apr 28 15:36:22 2009 +0000
>
>    Fix hostname checking in rpc.rquotad (Jan Kara)
>---
> rquota_svc.c |   30 ++++--------------------------
> 1 files changed, 4 insertions(+), 26 deletions(-)
>
>diff --git a/rquota_svc.c b/rquota_svc.c
>index af165f3..b275cee 100644
>--- a/rquota_svc.c
>+++ b/rquota_svc.c
>@@ -170,8 +170,7 @@ static void parse_options(int argc, char **argv)
> int good_client(struct sockaddr_in *addr, ulong rq_proc)
> {
> #ifdef HOSTS_ACCESS
>-	struct hostent *h;
>-	char *name, **ad;
>+	struct request_info req;
> #endif
> 	const char *remote=inet_ntoa(addr->sin_addr);
> 
>@@ -197,31 +196,10 @@ int good_client(struct sockaddr_in *addr, ulong rq_proc)
> 	/* NOTE: we could use different servicename for setquota calls to
> 	 * allow only some hosts to call setquota. */
> 
>-	/* Check IP address */
>-	if (hosts_ctl("rquotad", "", remote, ""))
>+	request_init(&req, RQ_DAEMON, "rquotad", RQ_CLIENT_SIN, addr, 0);
>+	sock_methods(&req);
>+	if (hosts_access(&req))
> 		return 1;
>-	/* Get address */
>-	if (!(h = gethostbyaddr((const char *)&(addr->sin_addr), sizeof(addr->sin_addr), AF_INET)))
>-		goto denied;
>-	if (!(name = alloca(strlen(h->h_name)+1)))
>-		goto denied;
>-	strcpy(name, h->h_name);
>-	/* Try to resolve it back */
>-	if (!(h = gethostbyname(name)))
>-		goto denied;
>-	for (ad = h->h_addr_list; *ad; ad++)
>-		if (!memcmp(*ad, &(addr->sin_addr), h->h_length))
>-			break;
>-	if (!*ad)	/* Our address not found? */
>-		goto denied;	
>-	/* Check host name */
>-	if (hosts_ctl("rquotad", "", h->h_name, ""))
>-		return 1;
>-	/* Check aliases */
>-	for (ad = h->h_aliases; *ad; ad++)
>-		if (hosts_ctl("rquotad", "", *ad, ""))
>-			return 1;
>-denied:
> 	errstr(_("Denied access to host %s\n"), remote);
> 	return 0;
> #else
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 566717: 601505