Commit 431f1974 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

userns: Convert quota netlink aka quota_send_warning 



Modify quota_send_warning to take struct kqid instead a type and
identifier pair.

When sending netlink broadcasts always convert uids and quota
identifiers into the intial user namespace.  There is as yet no way to
send a netlink broadcast message with different contents to receivers
in different namespaces, so for the time being just map all of the
identifiers into the initial user namespace which preserves the
current behavior.

Change the callers of quota_send_warning in gfs2, xfs and dquot
to generate a struct kqid to pass to quota send warning.  When
all of the user namespaces convesions are complete a struct kqid
values will be availbe without need for conversion, but a conversion
is needed now to avoid needing to convert everything at once.

Cc: Ben Myers <bpm@sgi.com>
Cc: Alex Elder <elder@kernel.org>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 74a8a103

fs/gfs2/quota.c

+8 −4
Original line number Diff line number Diff line
@@ -1070,8 +1070,10 @@ int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid) 


		if (be64_to_cpu(qd->qd_qb.qb_limit) && (s64)be64_to_cpu(qd->qd_qb.qb_limit) < value) {

			print_message(qd, "exceeded");

			quota_send_warning(test_bit(QDF_USER, &qd->qd_flags) ?

					   USRQUOTA : GRPQUOTA, qd->qd_id,

			quota_send_warning(make_kqid(&init_user_ns,

						     test_bit(QDF_USER, &qd->qd_flags) ?

						     USRQUOTA : GRPQUOTA,

						     qd->qd_id),

					   sdp->sd_vfs->s_dev, QUOTA_NL_BHARDWARN);



			error = -EDQUOT;
@@ -1081,8 +1083,10 @@ int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid) 
			   time_after_eq(jiffies, qd->qd_last_warn +

					 gfs2_tune_get(sdp,

						gt_quota_warn_period) * HZ)) {

			quota_send_warning(test_bit(QDF_USER, &qd->qd_flags) ?

					   USRQUOTA : GRPQUOTA, qd->qd_id,

			quota_send_warning(make_kqid(&init_user_ns,

						     test_bit(QDF_USER, &qd->qd_flags) ?

						     USRQUOTA : GRPQUOTA,

						     qd->qd_id),

					   sdp->sd_vfs->s_dev, QUOTA_NL_BSOFTWARN);

			error = print_message(qd, "warning");

			qd->qd_last_warn = jiffies;

fs/quota/dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -1236,7 +1236,7 @@ static void flush_warnings(struct dquot_warn *warn) 
#ifdef CONFIG_PRINT_QUOTA_WARNING

		print_warning(&warn[i]);

#endif

		quota_send_warning(warn[i].w_dq_type, warn[i].w_dq_id,

		quota_send_warning(make_kqid(&init_user_ns, warn[i].w_dq_type, warn[i].w_dq_id),

				   warn[i].w_sb->s_dev, warn[i].w_type);

	}

}

fs/quota/netlink.c

+6 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static struct genl_family quota_genl_family = { 
 *

 */



void quota_send_warning(short type, unsigned int id, dev_t dev,

void quota_send_warning(struct kqid qid, dev_t dev,

			const char warntype)

{

	static atomic_t seq;
@@ -56,10 +56,11 @@ void quota_send_warning(short type, unsigned int id, dev_t dev, 
		  "VFS: Cannot store netlink header in quota warning.\n");

		goto err_out;

	}

	ret = nla_put_u32(skb, QUOTA_NL_A_QTYPE, type);

	ret = nla_put_u32(skb, QUOTA_NL_A_QTYPE, qid.type);

	if (ret)

		goto attr_err_out;

	ret = nla_put_u64(skb, QUOTA_NL_A_EXCESS_ID, id);

	ret = nla_put_u64(skb, QUOTA_NL_A_EXCESS_ID,

			  from_kqid_munged(&init_user_ns, qid));

	if (ret)

		goto attr_err_out;

	ret = nla_put_u32(skb, QUOTA_NL_A_WARNING, warntype);
@@ -71,7 +72,8 @@ void quota_send_warning(short type, unsigned int id, dev_t dev, 
	ret = nla_put_u32(skb, QUOTA_NL_A_DEV_MINOR, MINOR(dev));

	if (ret)

		goto attr_err_out;

	ret = nla_put_u64(skb, QUOTA_NL_A_CAUSED_ID, current_uid());

	ret = nla_put_u64(skb, QUOTA_NL_A_CAUSED_ID,

			  from_kuid_munged(&init_user_ns, current_uid()));

	if (ret)

		goto attr_err_out;

	genlmsg_end(skb, msg_head);

fs/xfs/xfs_trans_dquot.c

+5 −3
Original line number Diff line number Diff line
@@ -578,9 +578,11 @@ xfs_quota_warn( 
	/* no warnings for project quotas - we just return ENOSPC later */

	if (dqp->dq_flags & XFS_DQ_PROJ)

		return;

	quota_send_warning((dqp->dq_flags & XFS_DQ_USER) ? USRQUOTA : GRPQUOTA,

			   be32_to_cpu(dqp->q_core.d_id), mp->m_super->s_dev,

			   type);

	quota_send_warning(make_kqid(&init_user_ns,

				     (dqp->dq_flags & XFS_DQ_USER) ?

				     USRQUOTA : GRPQUOTA,

				     be32_to_cpu(dqp->q_core.d_id)),

			   mp->m_super->s_dev, type);

}



/*

include/linux/quota.h

+2 −2
Original line number Diff line number Diff line
@@ -511,10 +511,10 @@ static inline unsigned int dquot_generic_flag(unsigned int flags, int type) 
}



#ifdef CONFIG_QUOTA_NETLINK_INTERFACE

extern void quota_send_warning(short type, unsigned int id, dev_t dev,

extern void quota_send_warning(struct kqid qid, dev_t dev,

			       const char warntype);

#else

static inline void quota_send_warning(short type, unsigned int id, dev_t dev,

static inline void quota_send_warning(struct kqid qid, dev_t dev,

				      const char warntype)

{

	return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE