Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b575156d authored by Eric Paris's avatar Eric Paris Committed by Linus Torvalds
Browse files

IMA: drop the inode opencount since it isn't needed for operation 



The opencount was used to help debugging to make sure that everything
which created a struct file also correctly made the IMA calls.  Since we
moved all of that into the VFS this isn't as necessary.  We should be
able to get the same amount of debugging out of just the reader and
write count.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Acked-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 85491641

security/integrity/ima/ima.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,6 @@ struct ima_iint_cache { 
	struct mutex mutex;	/* protects: version, flags, digest */

	struct mutex mutex;	/* protects: version, flags, digest */

	long readcount;		/* measured files readcount */

	long readcount;		/* measured files readcount */

	long writecount;	/* measured files writecount */

	long writecount;	/* measured files writecount */

	long opencount;		/* opens reference count */

	struct kref refcount;	/* ima_iint_cache reference count */

	struct kref refcount;	/* ima_iint_cache reference count */

};

};

security/integrity/ima/ima_iint.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -134,11 +134,6 @@ void iint_free(struct kref *kref) 
		       iint->writecount);

		       iint->writecount);

		iint->writecount = 0;

		iint->writecount = 0;

	}

	}

	if (iint->opencount != 0) {

		printk(KERN_INFO "%s: opencount: %ld\n", __func__,

		       iint->opencount);

		iint->opencount = 0;

	}

	kref_init(&iint->refcount);

	kref_init(&iint->refcount);

	kmem_cache_free(iint_cache, iint);

	kmem_cache_free(iint_cache, iint);

}

}
@@ -172,7 +167,6 @@ static void init_once(void *foo) 
	mutex_init(&iint->mutex);

	mutex_init(&iint->mutex);

	iint->readcount = 0;

	iint->readcount = 0;

	iint->writecount = 0;

	iint->writecount = 0;

	iint->opencount = 0;

	kref_init(&iint->refcount);

	kref_init(&iint->refcount);

}

}

security/integrity/ima/ima_main.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -122,7 +122,6 @@ static void ima_inc_counts(struct ima_iint_cache *iint, fmode_t mode) 
{

{

	BUG_ON(!mutex_is_locked(&iint->mutex));

	BUG_ON(!mutex_is_locked(&iint->mutex));





	iint->opencount++;

	if ((mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)

	if ((mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)

		iint->readcount++;

		iint->readcount++;

	if (mode & FMODE_WRITE)

	if (mode & FMODE_WRITE)
@@ -181,7 +180,6 @@ static void ima_dec_counts(struct ima_iint_cache *iint, struct inode *inode, 
	mode_t mode = file->f_mode;

	mode_t mode = file->f_mode;

	BUG_ON(!mutex_is_locked(&iint->mutex));

	BUG_ON(!mutex_is_locked(&iint->mutex));





	iint->opencount--;

	if ((mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)

	if ((mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)

		iint->readcount--;

		iint->readcount--;

	if (mode & FMODE_WRITE) {

	if (mode & FMODE_WRITE) {
@@ -192,13 +190,11 @@ static void ima_dec_counts(struct ima_iint_cache *iint, struct inode *inode, 
		}

		}

	}

	}





	if (((iint->opencount < 0) ||

	if (((iint->readcount < 0) ||

	     (iint->readcount < 0) ||

	     (iint->writecount < 0)) &&

	     (iint->writecount < 0)) &&

	    !ima_limit_imbalance(file)) {

	    !ima_limit_imbalance(file)) {

		printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld o:%ld)\n",

		printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld)\n",

		       __func__, iint->readcount, iint->writecount,

		       __func__, iint->readcount, iint->writecount);

		       iint->opencount);

		dump_stack();

		dump_stack();

	}

	}

}

}