diff options
Diffstat (limited to 'security/selinux/ss/policydb.c')
| -rw-r--r-- | security/selinux/ss/policydb.c | 658 |
1 files changed, 370 insertions, 288 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index c57802a164d..3a29704be8c 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/string.h> | 31 | #include <linux/string.h> |
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/audit.h> | 33 | #include <linux/audit.h> |
| 34 | #include <linux/flex_array.h> | ||
| 34 | #include "security.h" | 35 | #include "security.h" |
| 35 | 36 | ||
| 36 | #include "policydb.h" | 37 | #include "policydb.h" |
| @@ -655,6 +656,9 @@ static int range_tr_destroy(void *key, void *datum, void *p) | |||
| 655 | 656 | ||
| 656 | static void ocontext_destroy(struct ocontext *c, int i) | 657 | static void ocontext_destroy(struct ocontext *c, int i) |
| 657 | { | 658 | { |
| 659 | if (!c) | ||
| 660 | return; | ||
| 661 | |||
| 658 | context_destroy(&c->context[0]); | 662 | context_destroy(&c->context[0]); |
| 659 | context_destroy(&c->context[1]); | 663 | context_destroy(&c->context[1]); |
| 660 | if (i == OCON_ISID || i == OCON_FS || | 664 | if (i == OCON_ISID || i == OCON_FS || |
| @@ -736,11 +740,17 @@ void policydb_destroy(struct policydb *p) | |||
| 736 | hashtab_map(p->range_tr, range_tr_destroy, NULL); | 740 | hashtab_map(p->range_tr, range_tr_destroy, NULL); |
| 737 | hashtab_destroy(p->range_tr); | 741 | hashtab_destroy(p->range_tr); |
| 738 | 742 | ||
| 739 | if (p->type_attr_map) { | 743 | if (p->type_attr_map_array) { |
| 740 | for (i = 0; i < p->p_types.nprim; i++) | 744 | for (i = 0; i < p->p_types.nprim; i++) { |
| 741 | ebitmap_destroy(&p->type_attr_map[i]); | 745 | struct ebitmap *e; |
| 746 | |||
| 747 | e = flex_array_get(p->type_attr_map_array, i); | ||
| 748 | if (!e) | ||
| 749 | continue; | ||
| 750 | ebitmap_destroy(e); | ||
| 751 | } | ||
| 752 | flex_array_free(p->type_attr_map_array); | ||
| 742 | } | 753 | } |
| 743 | kfree(p->type_attr_map); | ||
| 744 | ebitmap_destroy(&p->policycaps); | 754 | ebitmap_destroy(&p->policycaps); |
| 745 | ebitmap_destroy(&p->permissive_map); | 755 | ebitmap_destroy(&p->permissive_map); |
| 746 | 756 | ||
| @@ -1701,6 +1711,333 @@ u32 string_to_av_perm(struct policydb *p, u16 tclass, const char *name) | |||
| 1701 | return 1U << (perdatum->value-1); | 1711 | return 1U << (perdatum->value-1); |
| 1702 | } | 1712 | } |
| 1703 | 1713 | ||
| 1714 | static int range_read(struct policydb *p, void *fp) | ||
| 1715 | { | ||
| 1716 | struct range_trans *rt = NULL; | ||
| 1717 | struct mls_range *r = NULL; | ||
| 1718 | int i, rc; | ||
| 1719 | __le32 buf[2]; | ||
| 1720 | u32 nel; | ||
| 1721 | |||
| 1722 | if (p->policyvers < POLICYDB_VERSION_MLS) | ||
| 1723 | return 0; | ||
| 1724 | |||
| 1725 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1726 | if (rc) | ||
| 1727 | goto out; | ||
| 1728 | |||
| 1729 | nel = le32_to_cpu(buf[0]); | ||
| 1730 | for (i = 0; i < nel; i++) { | ||
| 1731 | rc = -ENOMEM; | ||
| 1732 | rt = kzalloc(sizeof(*rt), GFP_KERNEL); | ||
| 1733 | if (!rt) | ||
| 1734 | goto out; | ||
| 1735 | |||
| 1736 | rc = next_entry(buf, fp, (sizeof(u32) * 2)); | ||
| 1737 | if (rc) | ||
| 1738 | goto out; | ||
| 1739 | |||
| 1740 | rt->source_type = le32_to_cpu(buf[0]); | ||
| 1741 | rt->target_type = le32_to_cpu(buf[1]); | ||
| 1742 | if (p->policyvers >= POLICYDB_VERSION_RANGETRANS) { | ||
| 1743 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1744 | if (rc) | ||
| 1745 | goto out; | ||
| 1746 | rt->target_class = le32_to_cpu(buf[0]); | ||
| 1747 | } else | ||
| 1748 | rt->target_class = p->process_class; | ||
| 1749 | |||
| 1750 | rc = -EINVAL; | ||
| 1751 | if (!policydb_type_isvalid(p, rt->source_type) || | ||
| 1752 | !policydb_type_isvalid(p, rt->target_type) || | ||
| 1753 | !policydb_class_isvalid(p, rt->target_class)) | ||
| 1754 | goto out; | ||
| 1755 | |||
| 1756 | rc = -ENOMEM; | ||
| 1757 | r = kzalloc(sizeof(*r), GFP_KERNEL); | ||
| 1758 | if (!r) | ||
| 1759 | goto out; | ||
| 1760 | |||
| 1761 | rc = mls_read_range_helper(r, fp); | ||
| 1762 | if (rc) | ||
| 1763 | goto out; | ||
| 1764 | |||
| 1765 | rc = -EINVAL; | ||
| 1766 | if (!mls_range_isvalid(p, r)) { | ||
| 1767 | printk(KERN_WARNING "SELinux: rangetrans: invalid range\n"); | ||
| 1768 | goto out; | ||
| 1769 | } | ||
| 1770 | |||
| 1771 | rc = hashtab_insert(p->range_tr, rt, r); | ||
| 1772 | if (rc) | ||
| 1773 | goto out; | ||
| 1774 | |||
| 1775 | rt = NULL; | ||
| 1776 | r = NULL; | ||
| 1777 | } | ||
| 1778 | rangetr_hash_eval(p->range_tr); | ||
| 1779 | rc = 0; | ||
| 1780 | out: | ||
| 1781 | kfree(rt); | ||
| 1782 | kfree(r); | ||
| 1783 | return rc; | ||
| 1784 | } | ||
| 1785 | |||
| 1786 | static int genfs_read(struct policydb *p, void *fp) | ||
| 1787 | { | ||
| 1788 | int i, j, rc; | ||
| 1789 | u32 nel, nel2, len, len2; | ||
| 1790 | __le32 buf[1]; | ||
| 1791 | struct ocontext *l, *c; | ||
| 1792 | struct ocontext *newc = NULL; | ||
| 1793 | struct genfs *genfs_p, *genfs; | ||
| 1794 | struct genfs *newgenfs = NULL; | ||
| 1795 | |||
| 1796 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1797 | if (rc) | ||
| 1798 | goto out; | ||
| 1799 | nel = le32_to_cpu(buf[0]); | ||
| 1800 | |||
| 1801 | for (i = 0; i < nel; i++) { | ||
| 1802 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1803 | if (rc) | ||
| 1804 | goto out; | ||
| 1805 | len = le32_to_cpu(buf[0]); | ||
| 1806 | |||
| 1807 | rc = -ENOMEM; | ||
| 1808 | newgenfs = kzalloc(sizeof(*newgenfs), GFP_KERNEL); | ||
| 1809 | if (!newgenfs) | ||
| 1810 | goto out; | ||
| 1811 | |||
| 1812 | rc = -ENOMEM; | ||
| 1813 | newgenfs->fstype = kmalloc(len + 1, GFP_KERNEL); | ||
| 1814 | if (!newgenfs->fstype) | ||
| 1815 | goto out; | ||
| 1816 | |||
| 1817 | rc = next_entry(newgenfs->fstype, fp, len); | ||
| 1818 | if (rc) | ||
| 1819 | goto out; | ||
| 1820 | |||
| 1821 | newgenfs->fstype[len] = 0; | ||
| 1822 | |||
| 1823 | for (genfs_p = NULL, genfs = p->genfs; genfs; | ||
| 1824 | genfs_p = genfs, genfs = genfs->next) { | ||
| 1825 | rc = -EINVAL; | ||
| 1826 | if (strcmp(newgenfs->fstype, genfs->fstype) == 0) { | ||
| 1827 | printk(KERN_ERR "SELinux: dup genfs fstype %s\n", | ||
| 1828 | newgenfs->fstype); | ||
| 1829 | goto out; | ||
| 1830 | } | ||
| 1831 | if (strcmp(newgenfs->fstype, genfs->fstype) < 0) | ||
| 1832 | break; | ||
| 1833 | } | ||
| 1834 | newgenfs->next = genfs; | ||
| 1835 | if (genfs_p) | ||
| 1836 | genfs_p->next = newgenfs; | ||
| 1837 | else | ||
| 1838 | p->genfs = newgenfs; | ||
| 1839 | genfs = newgenfs; | ||
| 1840 | newgenfs = NULL; | ||
| 1841 | |||
| 1842 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1843 | if (rc) | ||
| 1844 | goto out; | ||
| 1845 | |||
| 1846 | nel2 = le32_to_cpu(buf[0]); | ||
| 1847 | for (j = 0; j < nel2; j++) { | ||
| 1848 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1849 | if (rc) | ||
| 1850 | goto out; | ||
| 1851 | len = le32_to_cpu(buf[0]); | ||
| 1852 | |||
| 1853 | rc = -ENOMEM; | ||
| 1854 | newc = kzalloc(sizeof(*newc), GFP_KERNEL); | ||
| 1855 | if (!newc) | ||
| 1856 | goto out; | ||
| 1857 | |||
| 1858 | rc = -ENOMEM; | ||
| 1859 | newc->u.name = kmalloc(len + 1, GFP_KERNEL); | ||
| 1860 | if (!newc->u.name) | ||
| 1861 | goto out; | ||
| 1862 | |||
| 1863 | rc = next_entry(newc->u.name, fp, len); | ||
| 1864 | if (rc) | ||
| 1865 | goto out; | ||
| 1866 | newc->u.name[len] = 0; | ||
| 1867 | |||
| 1868 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1869 | if (rc) | ||
| 1870 | goto out; | ||
| 1871 | |||
| 1872 | newc->v.sclass = le32_to_cpu(buf[0]); | ||
| 1873 | rc = context_read_and_validate(&newc->context[0], p, fp); | ||
| 1874 | if (rc) | ||
| 1875 | goto out; | ||
| 1876 | |||
| 1877 | for (l = NULL, c = genfs->head; c; | ||
| 1878 | l = c, c = c->next) { | ||
| 1879 | rc = -EINVAL; | ||
| 1880 | if (!strcmp(newc->u.name, c->u.name) && | ||
| 1881 | (!c->v.sclass || !newc->v.sclass || | ||
| 1882 | newc->v.sclass == c->v.sclass)) { | ||
| 1883 | printk(KERN_ERR "SELinux: dup genfs entry (%s,%s)\n", | ||
| 1884 | genfs->fstype, c->u.name); | ||
| 1885 | goto out; | ||
| 1886 | } | ||
| 1887 | len = strlen(newc->u.name); | ||
| 1888 | len2 = strlen(c->u.name); | ||
| 1889 | if (len > len2) | ||
| 1890 | break; | ||
| 1891 | } | ||
| 1892 | |||
| 1893 | newc->next = c; | ||
| 1894 | if (l) | ||
| 1895 | l->next = newc; | ||
| 1896 | else | ||
| 1897 | genfs->head = newc; | ||
| 1898 | newc = NULL; | ||
| 1899 | } | ||
| 1900 | } | ||
| 1901 | rc = 0; | ||
| 1902 | out: | ||
| 1903 | if (newgenfs) | ||
| 1904 | kfree(newgenfs->fstype); | ||
| 1905 | kfree(newgenfs); | ||
| 1906 | ocontext_destroy(newc, OCON_FSUSE); | ||
| 1907 | |||
| 1908 | return rc; | ||
| 1909 | } | ||
| 1910 | |||
| 1911 | static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, | ||
| 1912 | void *fp) | ||
| 1913 | { | ||
| 1914 | int i, j, rc; | ||
| 1915 | u32 nel, len; | ||
| 1916 | __le32 buf[3]; | ||
| 1917 | struct ocontext *l, *c; | ||
| 1918 | u32 nodebuf[8]; | ||
| 1919 | |||
| 1920 | for (i = 0; i < info->ocon_num; i++) { | ||
| 1921 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1922 | if (rc) | ||
| 1923 | goto out; | ||
| 1924 | nel = le32_to_cpu(buf[0]); | ||
| 1925 | |||
| 1926 | l = NULL; | ||
| 1927 | for (j = 0; j < nel; j++) { | ||
| 1928 | rc = -ENOMEM; | ||
| 1929 | c = kzalloc(sizeof(*c), GFP_KERNEL); | ||
| 1930 | if (!c) | ||
| 1931 | goto out; | ||
| 1932 | if (l) | ||
| 1933 | l->next = c; | ||
| 1934 | else | ||
| 1935 | p->ocontexts[i] = c; | ||
| 1936 | l = c; | ||
| 1937 | |||
| 1938 | switch (i) { | ||
| 1939 | case OCON_ISID: | ||
| 1940 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1941 | if (rc) | ||
| 1942 | goto out; | ||
| 1943 | |||
| 1944 | c->sid[0] = le32_to_cpu(buf[0]); | ||
| 1945 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 1946 | if (rc) | ||
| 1947 | goto out; | ||
| 1948 | break; | ||
| 1949 | case OCON_FS: | ||
| 1950 | case OCON_NETIF: | ||
| 1951 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1952 | if (rc) | ||
| 1953 | goto out; | ||
| 1954 | len = le32_to_cpu(buf[0]); | ||
| 1955 | |||
| 1956 | rc = -ENOMEM; | ||
| 1957 | c->u.name = kmalloc(len + 1, GFP_KERNEL); | ||
| 1958 | if (!c->u.name) | ||
| 1959 | goto out; | ||
| 1960 | |||
| 1961 | rc = next_entry(c->u.name, fp, len); | ||
| 1962 | if (rc) | ||
| 1963 | goto out; | ||
| 1964 | |||
| 1965 | c->u.name[len] = 0; | ||
| 1966 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 1967 | if (rc) | ||
| 1968 | goto out; | ||
| 1969 | rc = context_read_and_validate(&c->context[1], p, fp); | ||
| 1970 | if (rc) | ||
| 1971 | goto out; | ||
| 1972 | break; | ||
| 1973 | case OCON_PORT: | ||
| 1974 | rc = next_entry(buf, fp, sizeof(u32)*3); | ||
| 1975 | if (rc) | ||
| 1976 | goto out; | ||
| 1977 | c->u.port.protocol = le32_to_cpu(buf[0]); | ||
| 1978 | c->u.port.low_port = le32_to_cpu(buf[1]); | ||
| 1979 | c->u.port.high_port = le32_to_cpu(buf[2]); | ||
| 1980 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 1981 | if (rc) | ||
| 1982 | goto out; | ||
| 1983 | break; | ||
| 1984 | case OCON_NODE: | ||
| 1985 | rc = next_entry(nodebuf, fp, sizeof(u32) * 2); | ||
| 1986 | if (rc) | ||
| 1987 | goto out; | ||
| 1988 | c->u.node.addr = nodebuf[0]; /* network order */ | ||
| 1989 | c->u.node.mask = nodebuf[1]; /* network order */ | ||
| 1990 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 1991 | if (rc) | ||
| 1992 | goto out; | ||
| 1993 | break; | ||
| 1994 | case OCON_FSUSE: | ||
| 1995 | rc = next_entry(buf, fp, sizeof(u32)*2); | ||
| 1996 | if (rc) | ||
| 1997 | goto out; | ||
| 1998 | |||
| 1999 | rc = -EINVAL; | ||
| 2000 | c->v.behavior = le32_to_cpu(buf[0]); | ||
| 2001 | if (c->v.behavior > SECURITY_FS_USE_NONE) | ||
| 2002 | goto out; | ||
| 2003 | |||
| 2004 | rc = -ENOMEM; | ||
| 2005 | len = le32_to_cpu(buf[1]); | ||
| 2006 | c->u.name = kmalloc(len + 1, GFP_KERNEL); | ||
| 2007 | if (!c->u.name) | ||
| 2008 | goto out; | ||
| 2009 | |||
| 2010 | rc = next_entry(c->u.name, fp, len); | ||
| 2011 | if (rc) | ||
| 2012 | goto out; | ||
| 2013 | c->u.name[len] = 0; | ||
| 2014 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 2015 | if (rc) | ||
| 2016 | goto out; | ||
| 2017 | break; | ||
| 2018 | case OCON_NODE6: { | ||
| 2019 | int k; | ||
| 2020 | |||
| 2021 | rc = next_entry(nodebuf, fp, sizeof(u32) * 8); | ||
| 2022 | if (rc) | ||
| 2023 | goto out; | ||
| 2024 | for (k = 0; k < 4; k++) | ||
| 2025 | c->u.node6.addr[k] = nodebuf[k]; | ||
| 2026 | for (k = 0; k < 4; k++) | ||
| 2027 | c->u.node6.mask[k] = nodebuf[k+4]; | ||
| 2028 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 2029 | if (rc) | ||
| 2030 | goto out; | ||
| 2031 | break; | ||
| 2032 | } | ||
| 2033 | } | ||
| 2034 | } | ||
| 2035 | } | ||
| 2036 | rc = 0; | ||
| 2037 | out: | ||
| 2038 | return rc; | ||
| 2039 | } | ||
| 2040 | |||
| 1704 | /* | 2041 | /* |
| 1705 | * Read the configuration data from a policy database binary | 2042 | * Read the configuration data from a policy database binary |
| 1706 | * representation file into a policy database structure. | 2043 | * representation file into a policy database structure. |
| @@ -1709,16 +2046,12 @@ int policydb_read(struct policydb *p, void *fp) | |||
| 1709 | { | 2046 | { |
| 1710 | struct role_allow *ra, *lra; | 2047 | struct role_allow *ra, *lra; |
| 1711 | struct role_trans *tr, *ltr; | 2048 | struct role_trans *tr, *ltr; |
| 1712 | struct ocontext *l, *c, *newc; | ||
| 1713 | struct genfs *genfs_p, *genfs, *newgenfs; | ||
| 1714 | int i, j, rc; | 2049 | int i, j, rc; |
| 1715 | __le32 buf[4]; | 2050 | __le32 buf[4]; |
| 1716 | u32 nodebuf[8]; | 2051 | u32 len, nprim, nel; |
| 1717 | u32 len, len2, nprim, nel, nel2; | 2052 | |
| 1718 | char *policydb_str; | 2053 | char *policydb_str; |
| 1719 | struct policydb_compat_info *info; | 2054 | struct policydb_compat_info *info; |
| 1720 | struct range_trans *rt; | ||
| 1721 | struct mls_range *r; | ||
| 1722 | 2055 | ||
| 1723 | rc = policydb_init(p); | 2056 | rc = policydb_init(p); |
| 1724 | if (rc) | 2057 | if (rc) |
| @@ -1919,294 +2252,45 @@ int policydb_read(struct policydb *p, void *fp) | |||
| 1919 | if (!p->process_trans_perms) | 2252 | if (!p->process_trans_perms) |
| 1920 | goto bad; | 2253 | goto bad; |
| 1921 | 2254 | ||
| 1922 | for (i = 0; i < info->ocon_num; i++) { | 2255 | rc = ocontext_read(p, info, fp); |
| 1923 | rc = next_entry(buf, fp, sizeof(u32)); | 2256 | if (rc) |
| 1924 | if (rc < 0) | ||
| 1925 | goto bad; | ||
| 1926 | nel = le32_to_cpu(buf[0]); | ||
| 1927 | l = NULL; | ||
| 1928 | for (j = 0; j < nel; j++) { | ||
| 1929 | c = kzalloc(sizeof(*c), GFP_KERNEL); | ||
| 1930 | if (!c) { | ||
| 1931 | rc = -ENOMEM; | ||
| 1932 | goto bad; | ||
| 1933 | } | ||
| 1934 | if (l) | ||
| 1935 | l->next = c; | ||
| 1936 | else | ||
| 1937 | p->ocontexts[i] = c; | ||
| 1938 | l = c; | ||
| 1939 | rc = -EINVAL; | ||
| 1940 | switch (i) { | ||
| 1941 | case OCON_ISID: | ||
| 1942 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1943 | if (rc < 0) | ||
| 1944 | goto bad; | ||
| 1945 | c->sid[0] = le32_to_cpu(buf[0]); | ||
| 1946 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 1947 | if (rc) | ||
| 1948 | goto bad; | ||
| 1949 | break; | ||
| 1950 | case OCON_FS: | ||
| 1951 | case OCON_NETIF: | ||
| 1952 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 1953 | if (rc < 0) | ||
| 1954 | goto bad; | ||
| 1955 | len = le32_to_cpu(buf[0]); | ||
| 1956 | c->u.name = kmalloc(len + 1, GFP_KERNEL); | ||
| 1957 | if (!c->u.name) { | ||
| 1958 | rc = -ENOMEM; | ||
| 1959 | goto bad; | ||
| 1960 | } | ||
| 1961 | rc = next_entry(c->u.name, fp, len); | ||
| 1962 | if (rc < 0) | ||
| 1963 | goto bad; | ||
| 1964 | c->u.name[len] = 0; | ||
| 1965 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 1966 | if (rc) | ||
| 1967 | goto bad; | ||
| 1968 | rc = context_read_and_validate(&c->context[1], p, fp); | ||
| 1969 | if (rc) | ||
| 1970 | goto bad; | ||
| 1971 | break; | ||
| 1972 | case OCON_PORT: | ||
| 1973 | rc = next_entry(buf, fp, sizeof(u32)*3); | ||
| 1974 | if (rc < 0) | ||
| 1975 | goto bad; | ||
| 1976 | c->u.port.protocol = le32_to_cpu(buf[0]); | ||
| 1977 | c->u.port.low_port = le32_to_cpu(buf[1]); | ||
| 1978 | c->u.port.high_port = le32_to_cpu(buf[2]); | ||
| 1979 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 1980 | if (rc) | ||
| 1981 | goto bad; | ||
| 1982 | break; | ||
| 1983 | case OCON_NODE: | ||
| 1984 | rc = next_entry(nodebuf, fp, sizeof(u32) * 2); | ||
| 1985 | if (rc < 0) | ||
| 1986 | goto bad; | ||
| 1987 | c->u.node.addr = nodebuf[0]; /* network order */ | ||
| 1988 | c->u.node.mask = nodebuf[1]; /* network order */ | ||
| 1989 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 1990 | if (rc) | ||
| 1991 | goto bad; | ||
| 1992 | break; | ||
| 1993 | case OCON_FSUSE: | ||
| 1994 | rc = next_entry(buf, fp, sizeof(u32)*2); | ||
| 1995 | if (rc < 0) | ||
| 1996 | goto bad; | ||
| 1997 | c->v.behavior = le32_to_cpu(buf[0]); | ||
| 1998 | if (c->v.behavior > SECURITY_FS_USE_NONE) | ||
| 1999 | goto bad; | ||
| 2000 | len = le32_to_cpu(buf[1]); | ||
| 2001 | c->u.name = kmalloc(len + 1, GFP_KERNEL); | ||
| 2002 | if (!c->u.name) { | ||
| 2003 | rc = -ENOMEM; | ||
| 2004 | goto bad; | ||
| 2005 | } | ||
| 2006 | rc = next_entry(c->u.name, fp, len); | ||
| 2007 | if (rc < 0) | ||
| 2008 | goto bad; | ||
| 2009 | c->u.name[len] = 0; | ||
| 2010 | rc = context_read_and_validate(&c->context[0], p, fp); | ||
| 2011 | if (rc) | ||
| 2012 | goto bad; | ||
| 2013 | break; | ||
| 2014 | case OCON_NODE6: { | ||
| 2015 | int k; | ||
| 2016 | |||
| 2017 | rc = next_entry(nodebuf, fp, sizeof(u32) * 8); | ||
| 2018 | if (rc < 0) | ||
| 2019 | goto bad; | ||
| 2020 | for (k = 0; k < 4; k++) | ||
| 2021 | c->u.node6.addr[k] = nodebuf[k]; | ||
| 2022 | for (k = 0; k < 4; k++) | ||
| 2023 | c->u.node6.mask[k] = nodebuf[k+4]; | ||
| 2024 | if (context_read_and_validate(&c->context[0], p, fp)) | ||
| 2025 | goto bad; | ||
| 2026 | break; | ||
| 2027 | } | ||
| 2028 | } | ||
| 2029 | } | ||
| 2030 | } | ||
| 2031 | |||
| 2032 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 2033 | if (rc < 0) | ||
| 2034 | goto bad; | 2257 | goto bad; |
| 2035 | nel = le32_to_cpu(buf[0]); | ||
| 2036 | genfs_p = NULL; | ||
| 2037 | rc = -EINVAL; | ||
| 2038 | for (i = 0; i < nel; i++) { | ||
| 2039 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 2040 | if (rc < 0) | ||
| 2041 | goto bad; | ||
| 2042 | len = le32_to_cpu(buf[0]); | ||
| 2043 | newgenfs = kzalloc(sizeof(*newgenfs), GFP_KERNEL); | ||
| 2044 | if (!newgenfs) { | ||
| 2045 | rc = -ENOMEM; | ||
| 2046 | goto bad; | ||
| 2047 | } | ||
| 2048 | 2258 | ||
| 2049 | newgenfs->fstype = kmalloc(len + 1, GFP_KERNEL); | 2259 | rc = genfs_read(p, fp); |
| 2050 | if (!newgenfs->fstype) { | 2260 | if (rc) |
| 2051 | rc = -ENOMEM; | 2261 | goto bad; |
| 2052 | kfree(newgenfs); | ||
| 2053 | goto bad; | ||
| 2054 | } | ||
| 2055 | rc = next_entry(newgenfs->fstype, fp, len); | ||
| 2056 | if (rc < 0) { | ||
| 2057 | kfree(newgenfs->fstype); | ||
| 2058 | kfree(newgenfs); | ||
| 2059 | goto bad; | ||
| 2060 | } | ||
| 2061 | newgenfs->fstype[len] = 0; | ||
| 2062 | for (genfs_p = NULL, genfs = p->genfs; genfs; | ||
| 2063 | genfs_p = genfs, genfs = genfs->next) { | ||
| 2064 | if (strcmp(newgenfs->fstype, genfs->fstype) == 0) { | ||
| 2065 | printk(KERN_ERR "SELinux: dup genfs " | ||
| 2066 | "fstype %s\n", newgenfs->fstype); | ||
| 2067 | kfree(newgenfs->fstype); | ||
| 2068 | kfree(newgenfs); | ||
| 2069 | goto bad; | ||
| 2070 | } | ||
| 2071 | if (strcmp(newgenfs->fstype, genfs->fstype) < 0) | ||
| 2072 | break; | ||
| 2073 | } | ||
| 2074 | newgenfs->next = genfs; | ||
| 2075 | if (genfs_p) | ||
| 2076 | genfs_p->next = newgenfs; | ||
| 2077 | else | ||
| 2078 | p->genfs = newgenfs; | ||
| 2079 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 2080 | if (rc < 0) | ||
| 2081 | goto bad; | ||
| 2082 | nel2 = le32_to_cpu(buf[0]); | ||
| 2083 | for (j = 0; j < nel2; j++) { | ||
| 2084 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 2085 | if (rc < 0) | ||
| 2086 | goto bad; | ||
| 2087 | len = le32_to_cpu(buf[0]); | ||
| 2088 | |||
| 2089 | newc = kzalloc(sizeof(*newc), GFP_KERNEL); | ||
| 2090 | if (!newc) { | ||
| 2091 | rc = -ENOMEM; | ||
| 2092 | goto bad; | ||
| 2093 | } | ||
| 2094 | |||
| 2095 | newc->u.name = kmalloc(len + 1, GFP_KERNEL); | ||
| 2096 | if (!newc->u.name) { | ||
| 2097 | rc = -ENOMEM; | ||
| 2098 | goto bad_newc; | ||
| 2099 | } | ||
| 2100 | rc = next_entry(newc->u.name, fp, len); | ||
| 2101 | if (rc < 0) | ||
| 2102 | goto bad_newc; | ||
| 2103 | newc->u.name[len] = 0; | ||
| 2104 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 2105 | if (rc < 0) | ||
| 2106 | goto bad_newc; | ||
| 2107 | newc->v.sclass = le32_to_cpu(buf[0]); | ||
| 2108 | if (context_read_and_validate(&newc->context[0], p, fp)) | ||
| 2109 | goto bad_newc; | ||
| 2110 | for (l = NULL, c = newgenfs->head; c; | ||
| 2111 | l = c, c = c->next) { | ||
| 2112 | if (!strcmp(newc->u.name, c->u.name) && | ||
| 2113 | (!c->v.sclass || !newc->v.sclass || | ||
| 2114 | newc->v.sclass == c->v.sclass)) { | ||
| 2115 | printk(KERN_ERR "SELinux: dup genfs " | ||
| 2116 | "entry (%s,%s)\n", | ||
| 2117 | newgenfs->fstype, c->u.name); | ||
| 2118 | goto bad_newc; | ||
| 2119 | } | ||
| 2120 | len = strlen(newc->u.name); | ||
| 2121 | len2 = strlen(c->u.name); | ||
| 2122 | if (len > len2) | ||
| 2123 | break; | ||
| 2124 | } | ||
| 2125 | 2262 | ||
| 2126 | newc->next = c; | 2263 | rc = range_read(p, fp); |
| 2127 | if (l) | 2264 | if (rc) |
| 2128 | l->next = newc; | 2265 | goto bad; |
| 2129 | else | ||
| 2130 | newgenfs->head = newc; | ||
| 2131 | } | ||
| 2132 | } | ||
| 2133 | 2266 | ||
| 2134 | if (p->policyvers >= POLICYDB_VERSION_MLS) { | 2267 | rc = -ENOMEM; |
| 2135 | int new_rangetr = p->policyvers >= POLICYDB_VERSION_RANGETRANS; | 2268 | p->type_attr_map_array = flex_array_alloc(sizeof(struct ebitmap), |
| 2136 | rc = next_entry(buf, fp, sizeof(u32)); | 2269 | p->p_types.nprim, |
| 2137 | if (rc < 0) | 2270 | GFP_KERNEL | __GFP_ZERO); |
| 2138 | goto bad; | 2271 | if (!p->type_attr_map_array) |
| 2139 | nel = le32_to_cpu(buf[0]); | 2272 | goto bad; |
| 2140 | for (i = 0; i < nel; i++) { | ||
| 2141 | rt = kzalloc(sizeof(*rt), GFP_KERNEL); | ||
| 2142 | if (!rt) { | ||
| 2143 | rc = -ENOMEM; | ||
| 2144 | goto bad; | ||
| 2145 | } | ||
| 2146 | rc = next_entry(buf, fp, (sizeof(u32) * 2)); | ||
| 2147 | if (rc < 0) { | ||
| 2148 | kfree(rt); | ||
| 2149 | goto bad; | ||
| 2150 | } | ||
| 2151 | rt->source_type = le32_to_cpu(buf[0]); | ||
| 2152 | rt->target_type = le32_to_cpu(buf[1]); | ||
| 2153 | if (new_rangetr) { | ||
| 2154 | rc = next_entry(buf, fp, sizeof(u32)); | ||
| 2155 | if (rc < 0) { | ||
| 2156 | kfree(rt); | ||
| 2157 | goto bad; | ||
| 2158 | } | ||
| 2159 | rt->target_class = le32_to_cpu(buf[0]); | ||
| 2160 | } else | ||
| 2161 | rt->target_class = p->process_class; | ||
| 2162 | if (!policydb_type_isvalid(p, rt->source_type) || | ||
| 2163 | !policydb_type_isvalid(p, rt->target_type) || | ||
| 2164 | !policydb_class_isvalid(p, rt->target_class)) { | ||
| 2165 | kfree(rt); | ||
| 2166 | rc = -EINVAL; | ||
| 2167 | goto bad; | ||
| 2168 | } | ||
| 2169 | r = kzalloc(sizeof(*r), GFP_KERNEL); | ||
| 2170 | if (!r) { | ||
| 2171 | kfree(rt); | ||
| 2172 | rc = -ENOMEM; | ||
| 2173 | goto bad; | ||
| 2174 | } | ||
| 2175 | rc = mls_read_range_helper(r, fp); | ||
| 2176 | if (rc) { | ||
| 2177 | kfree(rt); | ||
| 2178 | kfree(r); | ||
| 2179 | goto bad; | ||
| 2180 | } | ||
| 2181 | if (!mls_range_isvalid(p, r)) { | ||
| 2182 | printk(KERN_WARNING "SELinux: rangetrans: invalid range\n"); | ||
| 2183 | kfree(rt); | ||
| 2184 | kfree(r); | ||
| 2185 | goto bad; | ||
| 2186 | } | ||
| 2187 | rc = hashtab_insert(p->range_tr, rt, r); | ||
| 2188 | if (rc) { | ||
| 2189 | kfree(rt); | ||
| 2190 | kfree(r); | ||
| 2191 | goto bad; | ||
| 2192 | } | ||
| 2193 | } | ||
| 2194 | rangetr_hash_eval(p->range_tr); | ||
| 2195 | } | ||
| 2196 | 2273 | ||
| 2197 | p->type_attr_map = kmalloc(p->p_types.nprim * sizeof(struct ebitmap), GFP_KERNEL); | 2274 | /* preallocate so we don't have to worry about the put ever failing */ |
| 2198 | if (!p->type_attr_map) | 2275 | rc = flex_array_prealloc(p->type_attr_map_array, 0, p->p_types.nprim - 1, |
| 2276 | GFP_KERNEL | __GFP_ZERO); | ||
| 2277 | if (rc) | ||
| 2199 | goto bad; | 2278 | goto bad; |
| 2200 | 2279 | ||
| 2201 | for (i = 0; i < p->p_types.nprim; i++) { | 2280 | for (i = 0; i < p->p_types.nprim; i++) { |
| 2202 | ebitmap_init(&p->type_attr_map[i]); | 2281 | struct ebitmap *e = flex_array_get(p->type_attr_map_array, i); |
| 2282 | |||
| 2283 | BUG_ON(!e); | ||
| 2284 | ebitmap_init(e); | ||
| 2203 | if (p->policyvers >= POLICYDB_VERSION_AVTAB) { | 2285 | if (p->policyvers >= POLICYDB_VERSION_AVTAB) { |
| 2204 | if (ebitmap_read(&p->type_attr_map[i], fp)) | 2286 | rc = ebitmap_read(e, fp); |
| 2287 | if (rc) | ||
| 2205 | goto bad; | 2288 | goto bad; |
| 2206 | } | 2289 | } |
| 2207 | /* add the type itself as the degenerate case */ | 2290 | /* add the type itself as the degenerate case */ |
| 2208 | if (ebitmap_set_bit(&p->type_attr_map[i], i, 1)) | 2291 | rc = ebitmap_set_bit(e, i, 1); |
| 2209 | goto bad; | 2292 | if (rc) |
| 2293 | goto bad; | ||
| 2210 | } | 2294 | } |
| 2211 | 2295 | ||
| 2212 | rc = policydb_bounds_sanity_check(p); | 2296 | rc = policydb_bounds_sanity_check(p); |
| @@ -2216,8 +2300,6 @@ int policydb_read(struct policydb *p, void *fp) | |||
| 2216 | rc = 0; | 2300 | rc = 0; |
| 2217 | out: | 2301 | out: |
| 2218 | return rc; | 2302 | return rc; |
| 2219 | bad_newc: | ||
| 2220 | ocontext_destroy(newc, OCON_FSUSE); | ||
| 2221 | bad: | 2303 | bad: |
| 2222 | if (!rc) | 2304 | if (!rc) |
| 2223 | rc = -EINVAL; | 2305 | rc = -EINVAL; |
